1774 files changed, 0 insertions, 118686 deletions

diff --git a/community-staging/ario/PKGBUILD b/community-staging/ario/PKGBUILD
deleted file mode 100644
index 69a889d9f..000000000
--- a/community-staging/ario/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 62788 2012-01-26 21:41:05Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=ario
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster"
-arch=('i686' 'x86_64')
-url="http://ario-player.sourceforge.net/"
-license=('GPL')
-depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils')
-makedepends=('intltool' 'perl-xml-parser')
-options=('!libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz)
-sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
- }
-
-package () {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/ario/ario.changelog b/community-staging/ario/ario.changelog
deleted file mode 100644
index baca8a7b1..000000000
--- a/community-staging/ario/ario.changelog
+++ /dev/null
@@ -1,36 +0,0 @@
-2012-01-26  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-	
-2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5.1
-
-2010-08-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5
-
-2010-02-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.4.4
-
-2010-01-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.4.3
-
-2009-12-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.4.2
-
-2009-12-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.4.1
-
-2009-12-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.4
-
-2009-05-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* 'taglib' dependency added - version 1.3-2
-
-2009-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.3
-
-2009-03-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.2.2
-
-2009-01-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* adopted in [community]
-	* updated to major version 1.2.1
diff --git a/community-staging/ario/ario.install b/community-staging/ario/ario.install
deleted file mode 100644
index b711352cb..000000000
--- a/community-staging/ario/ario.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/armagetronad/PKGBUILD b/community-staging/armagetronad/PKGBUILD
deleted file mode 100644
index 94dfc61af..000000000
--- a/community-staging/armagetronad/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 62638 2012-01-23 01:56:45Z svenstaro $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com>
-
-pkgname=armagetronad
-pkgver=0.2.8.3.1
-pkgrel=3
-pkgdesc='A Tron Clone in 3D.'
-arch=('i686' 'x86_64')
-url='http://armagetronad.net/'
-license=('GPL')
-depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl')
-source=(http://downloads.sourceforge.net/sourceforge/armagetronad/armagetronad-$pkgver.src.tar.gz
-        armagetronad.desktop
-        gcc43.patch)
-md5sums=('ed8dbdec493de5cd4535a787f35eed1b'
-         '29d1b1231acadff12cf3014a3867ba5c'
-         '9045d99559ef33fc18136630e8de916c')
-
-build() {
-     cd armagetronad-$pkgver
-
-     # python2 fix
-     sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' language/update.py
-
-     sed -i 's|FTGL.h|ftgl.h|g' configure
-     sed -i 's|png_check_sig|png_sig_cmp|g' configure
-     patch -p1 < ../gcc43.patch
-     ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --disable-games \
-        --enable-automakedefaults
-     make
-     make DESTDIR=$pkgdir install
-     install -D -m 644 $srcdir/armagetronad.desktop $pkgdir/usr/share/applications/armagetronad.desktop
-     rm -rf $pkgdir/usr/share/applnk
-     rm $pkgdir/usr/bin/armagetronad-uninstall
-     mv $pkgdir/usr/bin/armagetronad $pkgdir/usr/bin/armagetronad_bin
-     printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > $pkgdir/usr/bin/armagetronad
-     chmod +x $pkgdir/usr/bin/armagetronad
-}
diff --git a/community-staging/armagetronad/armagetronad.desktop b/community-staging/armagetronad/armagetronad.desktop
deleted file mode 100644
index 125b4261d..000000000
--- a/community-staging/armagetronad/armagetronad.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Armagetronad
-GenericName=3D Tron clone
-GenericName[pl]=Klon gry Tron w 3D
-Exec=armagetronad
-Icon=/usr/share/armagetronad/desktop/icons/small/armagetronad.png
-Categories=Game;
-Terminal=false
-Type=Application
-Encoding=UTF-8
-StartupNotify=false
diff --git a/community-staging/armagetronad/gcc43.patch b/community-staging/armagetronad/gcc43.patch
deleted file mode 100644
index 358f48221..000000000
--- a/community-staging/armagetronad/gcc43.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -ur a/src/network/md5.cpp b/src/network/md5.cpp
---- a/src/network/md5.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/md5.cpp	2009-08-24 20:21:51.000000000 +0200
-@@ -75,7 +75,7 @@
-  */
- 
- #include "md5.h"
--
-+#include<cstring>
- #include <string>
- #include <memory>
- 
-Tylko w b/src/network: md5.cpp~
-diff -ur a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp
---- a/src/network/nNetwork.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nNetwork.cpp	2009-08-24 20:20:40.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tMemManager.h"
- #include "tInitExit.h"
- #include "nSimulatePing.h"
-Tylko w b/src/network: nNetwork.cpp~
-diff -ur a/src/network/nNetwork.h b/src/network/nNetwork.h
---- a/src/network/nNetwork.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nNetwork.h	2009-08-24 20:21:18.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #ifndef ArmageTron_NET_H
- #define ArmageTron_NET_H
--
-+#include<cstring>
- #include "tError.h"
- #include "tString.h"
- #include "tHeap.h"
-Tylko w b/src/network: nNetwork.h~
-diff -ur a/src/network/nSocket.h b/src/network/nSocket.h
---- a/src/network/nSocket.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nSocket.h	2009-08-24 20:22:09.000000000 +0200
-@@ -33,7 +33,7 @@
- 
- #ifndef NET_SOCKET_H
- #define NET_SOCKET_H
--
-+#include<cstring>
- #include <iostream>
- #include "tConsole.h"
- #include "tException.h"
-Tylko w b/src/network: nSocket.h~
-diff -ur a/src/render/rModel.h b/src/render/rModel.h
---- a/src/render/rModel.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/render/rModel.h	2009-08-24 20:20:57.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #ifndef ArmageTron_MODEL_H
- #define ArmageTron_MODEL_H
--
-+#include<cstring>
- #include "defs.h"
- #include "tArray.h"
- #include "tLinkedList.h"
-Tylko w b/src/render: rModel.h~
-diff -ur a/src/tools/tArray.cpp b/src/tools/tArray.cpp
---- a/src/tools/tArray.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tArray.cpp	2009-08-24 20:22:25.000000000 +0200
-@@ -27,7 +27,7 @@
- */
- 
- #define NO_MALLOC_REPLACEMENT
--
-+#include<cstring>
- #include "tMemManager.h"
- #include <iostream>
- #include <stdlib.h>
-Tylko w b/src/tools: tArray.cpp~
-diff -ur a/src/tools/tCommandLine.cpp b/src/tools/tCommandLine.cpp
---- a/src/tools/tCommandLine.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tCommandLine.cpp	2009-08-24 20:24:19.000000000 +0200
-@@ -30,7 +30,7 @@
- #ifndef		TCOMMANDLINE_H_INCLUDED
- #include	"tCommandLine.h"
- #endif
--
-+#include<cstring>
- #include    "tLocale.h"
- #include    "tConfiguration.h"
- #include    "tException.h"
-Tylko w b/src/tools: tCommandLine.cpp~
-diff -ur a/src/tools/tConfiguration.cpp b/src/tools/tConfiguration.cpp
---- a/src/tools/tConfiguration.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tConfiguration.cpp	2009-08-24 20:22:42.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "config.h"
- #include <fstream>
- #include <iomanip>
-Tylko w b/src/tools: tConfiguration.cpp~
-diff -ur a/src/tools/tCrypt.cpp b/src/tools/tCrypt.cpp
---- a/src/tools/tCrypt.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tCrypt.cpp	2009-08-24 20:22:54.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tCrypt.h"
- #include "tMemManager.h"
- 
-Tylko w b/src/tools: tCrypt.cpp~
-diff -ur a/src/tools/tDirectories.cpp b/src/tools/tDirectories.cpp
---- a/src/tools/tDirectories.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tDirectories.cpp	2009-08-24 20:23:06.000000000 +0200
-@@ -27,7 +27,7 @@
- */
- 
- #include "config.h"
--
-+#include<cstring>
- #include <errno.h>
- #include <sys/types.h>
- #include <stdio.h>
-Tylko w b/src/tools: tDirectories.cpp~
-diff -ur a/src/tools/tError.cpp b/src/tools/tError.cpp
---- a/src/tools/tError.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tError.cpp	2009-08-24 20:28:01.000000000 +0200
-@@ -24,8 +24,9 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "config.h"
-+#include<cstdlib>
- #include <iostream>
- #if HAVE_UNISTD_H
- #include <unistd.h>
-Tylko w b/src/tools: tError.cpp~
-diff -ur a/src/tools/tLocale.cpp b/src/tools/tLocale.cpp
---- a/src/tools/tLocale.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tLocale.cpp	2009-08-24 20:23:49.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "tConsole.h"
- #include "tDirectories.h"
- #include "tSafePTR.h"
--
-+#include<cstring>
- #include <fstream>
- #include <string>
- #include <map>
-Tylko w b/src/tools: tLocale.cpp~
-diff -ur a/src/tools/tMemManager.cpp b/src/tools/tMemManager.cpp
---- a/src/tools/tMemManager.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tMemManager.cpp	2009-08-24 20:24:42.000000000 +0200
-@@ -29,7 +29,7 @@
- #define NO_MALLOC_REPLACEMENT
- 
- #include "defs.h"
--
-+#include<cstring>
- #include <iostream>
- #include <sstream>
- #include <stdio.h>  // need basic C IO since STL IO does memory management
-Tylko w b/src/tools: tMemManager.cpp~
-diff -ur a/src/tools/tRandom.cpp b/src/tools/tRandom.cpp
---- a/src/tools/tRandom.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tRandom.cpp	2009-08-24 20:24:31.000000000 +0200
-@@ -29,7 +29,7 @@
- #ifndef		TRANDOM_H_INCLUDED
- #include	"tRandom.h"
- #endif
--
-+#include<cstdlib>
- #ifdef      HAVE_STDLIB
- #include    <stdlib.h>
- #endif
-Tylko w b/src/tools: tRandom.cpp~
-diff -ur a/src/tools/tString.cpp b/src/tools/tString.cpp
---- a/src/tools/tString.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tString.cpp	2009-08-24 20:24:03.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tMemManager.h"
- #include "tString.h"
- #include "tLocale.h"
-Tylko w b/src/tools: tString.cpp~
-diff -ur a/src/tron/gAIBase.h b/src/tron/gAIBase.h
---- a/src/tron/gAIBase.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tron/gAIBase.h	2009-08-24 20:21:33.000000000 +0200
-@@ -29,7 +29,7 @@
- #define ArmageTron_AIBASE_H
- 
- #include "rSDL.h"
--
-+#include<memory>
- #include "eTimer.h"
- #include "ePath.h"
- #include "ePlayer.h"
-Tylko w b/src/tron: gAIBase.h~
diff --git a/community-staging/blender/PKGBUILD b/community-staging/blender/PKGBUILD
deleted file mode 100644
index 0f23b4ae5..000000000
--- a/community-staging/blender/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $
-# Contributor: John Sowiak <john@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.61
-pkgrel=4
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio')
-makedepends=('cmake' 'boost' 'cuda-toolkit')
-optdepends=('cuda-toolkit: cycles renderer cuda support')
-options=(!strip)
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('11a4721ff92286f678bb2e05e5f29c97')
-else
-  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=38016
-  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=ON \
-    -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DWITH_CYCLES:BOOL=ON \
-    -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \
-    -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \
-    -DWITH_FFTW3:BOOL=ON \
-    -DWITH_MOD_OCEANSIM:BOOL=ON \
-    -DPYTHON_VERSION:STRING=3.2 \
-    -DPYTHON_LIBPATH:STRING=/usr/lib \
-    -DPYTHON_LIBRARY:STRING=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-    $ENABLESSE2
-
-  make $MAKEFLAGS
-
-  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
-    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
-  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
-  chmod 755 bmake
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/community-staging/blender/blender.install b/community-staging/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/community-staging/blender/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/bwbar/PKGBUILD b/community-staging/bwbar/PKGBUILD
deleted file mode 100644
index 9d2a2eba3..000000000
--- a/community-staging/bwbar/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 62406 2012-01-19 19:54:11Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Mark Rosenstand <mark@borkware.net>
-
-pkgname=bwbar
-pkgver=1.2.3
-pkgrel=3
-arch=(i686 x86_64)
-pkgdesc="Generates text and graphical readout of the current bandwidth usage."
-url="http://www.kernel.org/pub/software/web/bwbar/"
-license=("GPL")
-depends=('libpng')
-#source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz)
-source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz)
-md5sums=('766265ddf0615b552ff19d12f78be719')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i '1,1i#include <zlib.h>' bwbar.c
-  sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' bwbar.c
-  ./configure
-  make
-  install -D -m755 bwbar $pkgdir/usr/bin/bwbar
-}
diff --git a/community-staging/calibre/PKGBUILD b/community-staging/calibre/PKGBUILD
deleted file mode 100644
index 720658ce7..000000000
--- a/community-staging/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 62822 2012-01-27 11:24:45Z 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.37
-pkgrel=2
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64') 
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
-         'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 
-         'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 
-         'python-imaging' 'desktop-file-utils' 'shared-mime-info' 
-         'python-dnspython' 'unrar' 'python2-pyqt' 'icu')
-makedepends=('python2-pycountry')
-optdepends=('ipython: to use calibre-debug')
-install=calibre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'desktop_integration.patch'
-        'calibre-mount-helper')
-md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26'
-         '253ce4fe5d01f8ff76b63cd3825755ea'
-         '675cd87d41342119827ef706055491e7')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  #rm -rf src/{cherrypy,pyPdf}
-  rm -rf src/cherrypy
-  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
-  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
-    $(find . -regex ".*.py\|.*.recipe")
-
-  python2 setup.py build
-#  python2 setup.py resources
-  python2 setup.py translations
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  
-  patch -Np1 -i "${srcdir}/desktop_integration.patch"
-
-  # More on desktop integration (e.g. enforce arch defaults)
-  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
-      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
-      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
-      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-
-  # Fix the environment module location
-  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-
-  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
-  python2 setup.py install --root="${pkgdir}" --prefix=/usr \
-    --staging-bindir="${pkgdir}/usr/bin" \
-    --staging-libdir="${pkgdir}/usr/lib" \
-    --staging-sharedir="${pkgdir}/usr/share"
-
-  find "${pkgdir}" -type d -empty -delete
-
-  # Decompress the man pages so makepkg will do it for us.
-  for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do
-    bzip2 -d "${decom}"
-  done
-
-  # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
-  rm -rf ${pkgdir}/usr/bin/calibre-mount-helper
-  install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin"
-}
diff --git a/community-staging/calibre/calibre-mount-helper b/community-staging/calibre/calibre-mount-helper
deleted file mode 100644
index 00cac4270..000000000
--- a/community-staging/calibre/calibre-mount-helper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-# Replacement for upstream mount helper using udisks/eject
-# (C) 2010 Martin Pitt <mpitt@debian.org>
-
-ACTION="$1"
-DEV="$2"
-
-case "$ACTION" in
-    mount)
-	udisks --mount "$DEV"
-    
-	# check if mount worked. If not, fail
-	# udisks does return 0 even if mount failed
-	mount | grep -q "$DEV" || exit 0
-	;;
-
-    eject)
-	eject "$DEV"
-	;;
-
-    cleanup)
-	;;
-
-    *)
-	echo "unknown action" >&2
-	exit 1
-esac
-
diff --git a/community-staging/calibre/calibre.install b/community-staging/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community-staging/calibre/calibre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/calibre/desktop_integration.patch b/community-staging/calibre/desktop_integration.patch
deleted file mode 100644
index 4dbf53757..000000000
--- a/community-staging/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/src/calibre/linux.py	2011-06-17 19:56:05.000000000 +0200
-+++ b/src/calibre/linux.py	2011-06-18 00:07:46.000000000 +0200
-@@ -339,51 +339,39 @@
- 
-             with TemporaryDirectory() as tdir:
-                 with CurrentDir(tdir):
--                    render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                    self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                    self.icon_resources.append(('mimetypes', 'application-lrs',
--                    '128'))
--                    render_img('lt.png', 'calibre-gui.png')
--                    check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
--                    self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                    render_img('viewer.png', 'calibre-viewer.png')
--                    check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                    self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+                    dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                    os.mkdir(dir)
-+                    render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                    render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                    render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
- 
-                     mimetypes = set([])
-                     for x in all_input_formats():
-                         mt = guess_type('dummy.'+x)[0]
--                        if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                        if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                             mimetypes.add(mt)
- 
-                     def write_mimetypes(f):
-                         f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
--                    f = open('calibre-lrfviewer.desktop', 'wb')
-+                    dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                    os.mkdir(dir)
-+                    f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-                     f.write(VIEWER)
-                     f.close()
--                    f = open('calibre-ebook-viewer.desktop', 'wb')
-+                    f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                     f.write(EVIEWER)
-                     write_mimetypes(f)
-                     f.close()
--                    f = open('calibre-gui.desktop', 'wb')
-+                    f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                     f.write(GUI)
-                     write_mimetypes(f)
-                     f.close()
--                    des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                            'calibre-ebook-viewer.desktop')
--                    for x in des:
--                        cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                        check_call(' '.join(cmd), shell=True)
--                        self.menu_resources.append(x)
--                    check_call(['xdg-desktop-menu', 'forceupdate'])
--                    f = open('calibre-mimetypes', 'wb')
-+                    dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                    os.makedirs(dir)
-+                    f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                     f.write(MIME)
-                     f.close()
--                    self.mime_resources.append('calibre-mimetypes')
--                    check_call('xdg-mime install ./calibre-mimetypes', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise
diff --git a/community-staging/caph/PKGBUILD b/community-staging/caph/PKGBUILD
deleted file mode 100644
index 3ba543785..000000000
--- a/community-staging/caph/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62387 2012-01-19 18:48:33Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: jose <jose1711 [at] gmail (dot) com>
-
-pkgname=caph
-arch=('i686' 'x86_64')
-pkgver=1.1
-pkgrel=2
-pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element"
-license=('GPL')
-url="http://sourceforge.net/projects/caphgame/"
-depends=('sdl' 'libgl' 'libpng')
-makedepends=('mesa')
-source=("http://sourceforge.net/projects/caphgame/files/caph/caphgame-${pkgver}/caph-${pkgver}.tar.bz2" 
-        "caph.desktop")
-md5sums=('dbc2cfbb5cd98a77c5b731515d3a77b9'
-         '79c6448995026f77fd912dd109b50287')
-
-build() {
-  cd $srcdir/caph-${pkgver}/src
-  mkdir -p $pkgdir/usr/{bin,share/{caph/maps,doc/caph}}
-  ./confg
-  ./build
-}
-
-package() {
-  cd $srcdir/caph-${pkgver}/src
-  install -D -m755 ./caph $pkgdir/usr/bin/caph
-  install -D -m644 ../doc/caph/* $pkgdir/usr/share/doc/caph/ || true
-  install -D -m644 ../share/caph/* $pkgdir/usr/share/caph/ || true
-  install -D -m644 ../share/caph/maps/* $pkgdir/usr/share/caph/maps || true
-  install -D -m644 $srcdir/caph.desktop $pkgdir/usr/share/applications/caph.desktop
-  install -D -m644 ../share/caph/brush.png $pkgdir/usr/share/pixmaps/caph.png
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/caph/caph.desktop b/community-staging/caph/caph.desktop
deleted file mode 100644
index 6cc6c711c..000000000
--- a/community-staging/caph/caph.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Caph
-Comment=Sandbox game based on physics
-Exec=caph
-Icon=caph.png
-Categories=Game;LogicGame;
diff --git a/community-staging/clanlib/PKGBUILD b/community-staging/clanlib/PKGBUILD
deleted file mode 100644
index 60e6cada0..000000000
--- a/community-staging/clanlib/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 62388 2012-01-19 18:49:44Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=clanlib
-pkgver=2.3.4
-pkgrel=2
-pkgdesc="A multi-platform game development library."
-arch=('i686' 'x86_64')
-url="http://clanlib.org/"
-license=('zlib')
-depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3')
-makedepends=('doxygen' 'graphviz')
-options=('!libtool')
-source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
-md5sums=('cc89f632aa194399e909bbbd13beca1b')
-
-build() { 
-	cd ${srcdir}/ClanLib-${pkgver}
-
-	./configure --prefix=/usr --enable-docs
-
-	make
-  # Somehow this breaks. :(
-	#make html
-}
-
-package() {
-	cd ${srcdir}/ClanLib-${pkgver}
-
-	make DESTDIR=${pkgdir} install
-	#make DESTDIR=${pkgdir} install-html
-
-	install -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/compiz/PKGBUILD b/community-staging/compiz/PKGBUILD
deleted file mode 100644
index 0d049ce7c..000000000
--- a/community-staging/compiz/PKGBUILD
+++ /dev/null
@@ -1,125 +0,0 @@
-# $Id: PKGBUILD 17032 2010-05-17 11:13:51Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Hussam Al-Tayeb ht990332@gmail.com
-# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
-# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-
-pkgbase=compiz
-pkgname=('compiz-core'
-	'compiz-decorator-kde'
-	'compiz-decorator-gtk')
-pkgver=0.8.8
-pkgrel=3
-pkgdesc="Composite manager for Aiglx and Xgl"
-url="http://www.compiz.org/"
-license=('GPL' 'LGPL' 'MIT')
-arch=('i686' 'x86_64')
-groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion')
-makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace'
- 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity')
-options=(!libtool !emptydirs)
-conflicts=('compiz' 'compiz-core-git' 'compiz-git')
-replaces=('compiz')
-source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch)
-sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
-          '148656352f8a20b3781ee185025c5c8d4b7d720f')
-
-build()
-{
-  cd "$srcdir/compiz-$pkgver"
-  patch -p1 -i ../compiz-build.patch
-  ./configure   --prefix=/usr \
-	    --enable-gnome \
-	    --enable-gtk \
-	    --enable-metacity \
-	    --enable-gconf \
-            --with-gconf-schema-file-dir=/etc/gconf/schemas \
-	    --enable-dbus \
-	    --enable-librsvg \
-	    --disable-kde \
-	    --enable-kde4
-
-  make
-}
-
-package_compiz-core()
-{
-
-  pkgdesc="Composite manager for Aiglx and Xgl"
-  depends=('startup-notification' 'librsvg' \
-         'libgl' 'dbus' 'mesa' 'libxslt' 'fuse')
-
-  cd "$srcdir/compiz-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the decorations
-   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf "${pkgdir}"/etc
-
-  # install MIT license
-  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
-	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
-}
-
-package_compiz-decorator-gtk()
-{
-  pkgdesc="Compiz decorator for GNOME"
-  depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity')
-  install=compiz-decorator-gtk.install
-
-  cd "$srcdir/compiz-$pkgver"
-
-  pushd gtk
-  make DESTDIR="$pkgdir" install
-  install -Dm644 window-decorator/gwd.schemas \
-                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
-  popd
-
-  for i in dbus gconf ini inotify png regex svg glib kconfig
-  do
-    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
-  done
-
-  gconf-merge-schema \
-    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
-
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the other packages
-   rm -rf "${pkgdir}"/etc
-   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf "$pkgdir"/usr/include
-   cd "$pkgdir"/usr/lib
-   rm libdecoration*
-   rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd "${pkgdir}"/usr/lib/compiz
-   rm $(ls --hide=*gconf*)
-   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
-   
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
-}
-
-package_compiz-decorator-kde()
-{
-  pkgdesc="Compiz decorator for KDE"
-  depends=('kdebase-workspace' 'compiz-core')
-
-  cd "$srcdir"/compiz-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf "$pkgdir"/usr/{include,lib}
-  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
-
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
-}
-
diff --git a/community-staging/compiz/compiz-build.patch b/community-staging/compiz/compiz-build.patch
deleted file mode 100644
index f22a3fa21..000000000
--- a/community-staging/compiz/compiz-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
-+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
-@@ -986,10 +986,10 @@
- {
-     Atom    atom = Atoms::compizWindowBlurDecor;
-     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    Region  topRegion = NULL;
--    Region  bottomRegion = NULL;
--    Region  leftRegion = NULL;
--    Region  rightRegion = NULL;
-+    ::Region  topRegion = NULL;
-+    ::Region  bottomRegion = NULL;
-+    ::Region  leftRegion = NULL;
-+    ::Region  rightRegion = NULL;
-     int     size = 0;
-     int     w, h;
- 
diff --git a/community-staging/compiz/compiz-decorator-gtk.install b/community-staging/compiz/compiz-decorator-gtk.install
deleted file mode 100644
index b3738fda9..000000000
--- a/community-staging/compiz/compiz-decorator-gtk.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-}
-
-post_remove() {
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-}
-
diff --git a/community-staging/coq/PKGBUILD b/community-staging/coq/PKGBUILD
deleted file mode 100644
index 15223d9d4..000000000
--- a/community-staging/coq/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: George Giorgidze <giorgidze@gmail.com>
-
-pkgname=coq
-pkgver=8.3pl3
-pkgrel=2
-pkgdesc='Formal proof management system.'
-arch=('i686' 'x86_64')
-url='http://coq.inria.fr/'
-license=('GPL')
-options=('!emptydirs')
-depends=('gtk2' 'lablgtk2' 'ocaml')
-makedepends=('camlp5-transitional' 'netpbm' 'hevea')
-source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz")
-md5sums=('37e9a52110a025128667c03fed75f9c2')
-
-build() {
-  cd coq-${pkgver}
-
-  ./configure \
-    -prefix '/usr' \
-    -mandir '/usr/share/man' \
-    -opt \
-    -with-doc yes
-
-  make world
-
-  make doc-html
-}
-
-package() {
-  cd coq-${pkgver}
-
-  make COQINSTALLPREFIX=${pkgdir} install
-
-  make COQINSTALLPREFIX=${pkgdir} install-doc-html
-}
diff --git a/community-staging/critter/PKGBUILD b/community-staging/critter/PKGBUILD
deleted file mode 100644
index 429ab1ebf..000000000
--- a/community-staging/critter/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 62631 2012-01-22 22:37:03Z lcarlier $
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us>
-
-pkgname=critter
-_origname=CriticalMass
-pkgver=1.0.2
-pkgrel=6
-pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/criticalmass"
-license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'mesa')
-source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2
-        critter-gcc43.patch
-        criticalmass-1.0.2-libpng15.patch
-        critter.desktop)
-md5sums=('e2aff114bffa717fb79c82e1dc473ebe'
-         'e936920acce56bfa3b0123ca8b1193a6'
-         '76448ba5b7a42aec8fd2a5d1bc31b8e2'
-         '98c17809aed964c445adad09827035df')
-
-build() {
-  cd ${srcdir}/$_origname-${pkgver}
-
-  patch -Np1 -i ../critter-gcc43.patch
-  patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch
-  sed -i 's|-lpng12|-lpng15|g' configure
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/$_origname-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png
-  install -Dm644 ../critter.desktop \
-    ${pkgdir}/usr/share/applications/critter.desktop
-}
diff --git a/community-staging/critter/criticalmass-1.0.2-libpng15.patch b/community-staging/critter/criticalmass-1.0.2-libpng15.patch
deleted file mode 100644
index ac1b8c0c6..000000000
--- a/community-staging/critter/criticalmass-1.0.2-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- game/main.cpp
-+++ game/main.cpp
-@@ -28,6 +28,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <zlib.h>
-+
- void migrateConfig( void)
- {
-     //if onlineCheck is not set, default it to true
---- utilssdl/PNG.cpp
-+++ utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
-     png_size_t check;
- 
--    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
-     if( check != length)
-     {
- 	png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- 	return false;
-     }
- 
--    if( setjmp(_png->jmpbuf))
-+    if( setjmp(png_jmpbuf(_png)))
-     {
- 	fclose( fp);
- 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/community-staging/critter/critter-gcc43.patch b/community-staging/critter/critter-gcc43.patch
deleted file mode 100644
index ade42d8e4..000000000
--- a/community-staging/critter/critter-gcc43.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp CriticalMass-1.0.2/tinyxml/tinyxml.cpp
---- CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp	2003-03-03 12:34:58.000000000 +1000
-+++ CriticalMass-1.0.2/tinyxml/tinyxml.cpp	2008-04-01 22:26:47.000000000 +1000
-@@ -22,7 +22,8 @@
- */

- 

- #include "tinyxml.h"

--

-+#include <cstring>

-+#include <cstdlib>

- 

- TiXmlNode::TiXmlNode( NodeType _type )

- {

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

- #include "tinyxml.h"

- #include <ctype.h>

--

-+#include <cstring>

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

- {

- 	while ( p && *p && 

-diff -Naur CriticalMass-1.0.2-old/utils/ResourceManager.cpp CriticalMass-1.0.2/utils/ResourceManager.cpp
---- CriticalMass-1.0.2-old/utils/ResourceManager.cpp	2005-01-02 12:59:29.000000000 +1000
-+++ CriticalMass-1.0.2/utils/ResourceManager.cpp	2008-04-01 22:27:19.000000000 +1000
-@@ -15,6 +15,7 @@
- #include <iomanip>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <cstring>
- 
- #include <Trace.hpp>
- #include <ResourceManager.hpp>
-diff -Naur CriticalMass-1.0.2-old/utils/Value.hpp CriticalMass-1.0.2/utils/Value.hpp
---- CriticalMass-1.0.2-old/utils/Value.hpp	2004-12-18 12:41:24.000000000 +1000
-+++ CriticalMass-1.0.2/utils/Value.hpp	2008-04-01 22:27:39.000000000 +1000
-@@ -17,6 +17,7 @@
- 
- #include <stdio.h>
- #include <string>
-+#include <cstdlib>
- 
- #include <Trace.hpp>
- 
-diff -Naur CriticalMass-1.0.2-old/utils/zStream.cpp CriticalMass-1.0.2/utils/zStream.cpp
---- CriticalMass-1.0.2-old/utils/zStream.cpp	2005-08-01 06:06:14.000000000 +1000
-+++ CriticalMass-1.0.2/utils/zStream.cpp	2008-04-01 22:28:03.000000000 +1000
-@@ -17,6 +17,7 @@
- #include <zStream.hpp>
- #include <zStreamBufferImplLZMA.hpp>
- #include <zStreamBufferImplZLib.hpp>
-+#include <cstdlib>
- 
- ofstream &operator<<( ofstream &outfile, Uint32 i)
- {       
-diff -Naur CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp
---- CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp	2005-08-01 06:06:14.000000000 +1000
-+++ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp	2008-04-01 22:28:23.000000000 +1000
-@@ -14,6 +14,7 @@
- //
- #include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
-+#include <cstdlib>
- 
- bool ziStreamBufferImplZLib::init( void)
- {
diff --git a/community-staging/critter/critter.desktop b/community-staging/critter/critter.desktop
deleted file mode 100644
index ded5a9fbf..000000000
--- a/community-staging/critter/critter.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Critical Mass
-Comment=SDL/OpenGL space shoot'em up game
-Exec=critter
-Icon=critter
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Game;
diff --git a/community-staging/cwiid/PKGBUILD b/community-staging/cwiid/PKGBUILD
deleted file mode 100644
index 89ecebc78..000000000
--- a/community-staging/cwiid/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62957 2012-01-29 14:24:43Z jelle $
-# 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-staging/cwiid/bluez4.patch b/community-staging/cwiid/bluez4.patch
deleted file mode 100644
index dbbc790c5..000000000
--- a/community-staging/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-staging/cwiid/cwiid.install b/community-staging/cwiid/cwiid.install
deleted file mode 100644
index 05e698be7..000000000
--- a/community-staging/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-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD
deleted file mode 100644
index 48c078e89..000000000
--- a/community-staging/darktable/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 62299 2012-01-19 06:47:22Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Christian Himpel <chressie at gmail dot com>
-# Contributor: Johannes Hanika <hanatos at gmail dot com>
-
-pkgname=darktable
-pkgver=0.9.3
-_pkgver=0.9
-pkgrel=5
-pkgdesc="Utility to organize and develop raw images"
-arch=('i686' 'x86_64')
-url=http://darktable.sf.net/
-license=('GPL3')
-depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
-	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3')
-makedepends=('intltool>=0.40' 'cmake' 'librsvg')
-#	     'gnome-doc-utils' 'libxslt' 'fop')
-optdepends=('librsvg')
-install=darktable.install
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('49253a3a2990a4bf8e0b0a19295f19bd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-#  mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt
-  mkdir -p build
-  cd build
-  cmake \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DDONT_INSTALL_GCONF_SCHEMAS=True \
-      -DBINARY_PACKAGE_BUILD=1 \
-      -DUSE_GCONF_BACKEND=Off \
-      -DBUILD_USERMANUAL=False \
-      ..
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/build
-  make DESTDIR=$pkgdir install
-  mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
-#  mkdir -p "${pkgdir}/usr/share/gconf/schemas/"
-#  mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/"
-}
diff --git a/community-staging/darktable/darktable.install b/community-staging/darktable/darktable.install
deleted file mode 100644
index 9fd6af293..000000000
--- a/community-staging/darktable/darktable.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=darktable
-
-post_install() {
-#  usr/sbin/gconfpkg --install ${pkgname}
-  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-#  usr/sbin/gconfpkg --uninstall ${pkgname}
-  true
-}
-
-post_remove() {
-  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
-}
diff --git a/community-staging/devil/PKGBUILD b/community-staging/devil/PKGBUILD
deleted file mode 100644
index 11ed311ba..000000000
--- a/community-staging/devil/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62634 2012-01-22 22:50:07Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: TheHoff <forums>
-
-pkgname=devil
-pkgver=1.7.8
-pkgrel=10
-pkgdesc="Library for reading several different image formats"
-arch=('i686' 'x86_64')
-url="http://openil.sourceforge.net/"
-depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
-install=devil.install
-options=('!libtool' '!docs' '!emptydirs')
-license=('GPL')
-source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
-md5sums=('7918f215524589435e5ec2e8736d5e1d'
-         '0f839ccefd43b0ee8b4b3f99806147fc')
-
-build() {
-   cd ${srcdir}/devil-$pkgver
-
-   patch -Np1 -i ${srcdir}/libpng14.patch
-
-   ./configure --prefix=/usr --enable-ILU
-   make
-}
-
-package() {
-   cd ${srcdir}/devil-$pkgver
-
-   make prefix=${pkgdir}/usr install
-}
diff --git a/community-staging/devil/devil.install b/community-staging/devil/devil.install
deleted file mode 100644
index 8336ac3d1..000000000
--- a/community-staging/devil/devil.install
+++ /dev/null
@@ -1,11 +0,0 @@
-infodir=usr/share/info
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/community-staging/devil/libpng14.patch b/community-staging/devil/libpng14.patch
deleted file mode 100644
index b8434692b..000000000
--- a/community-staging/devil/libpng14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
---- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
-@@ -525,7 +525,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(ico_png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
-diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
---- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
-@@ -105,7 +105,7 @@
- 	Read = iread(Signature, 1, 8);
- 	iseek(-Read, IL_SEEK_CUR);
- 
--	return png_check_sig(Signature, 8);
-+	return png_sig_cmp(Signature, 0, 8) == 0;
- }
- 
- 
-@@ -278,7 +278,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
diff --git a/community-staging/dia/PKGBUILD b/community-staging/dia/PKGBUILD
deleted file mode 100644
index 0a2d5e7b5..000000000
--- a/community-staging/dia/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 62396 2012-01-19 19:26:59Z spupykin $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-
-pkgname=dia
-pkgver=0.97.2
-pkgrel=2
-pkgdesc="A GTK+ based diagram creation program"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Dia"
-install=dia.install
-depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2')
-makedepends=('intltool' 'python2' 'docbook-xsl')
-optdepends=('python2')
-options=('!libtool' 'docs')
-source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
-	"dia-overflow-fix.patch")
-md5sums=('1e1180a513fb567709b09bc19f12105e'
-         '8fd9a2ad35b5a6fd8c758d7c73dbfe66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=/usr/bin/python2
-  sed -i 's#python2\.1#python2 python2.1#' configure
-#  patch -p1 <$srcdir/dia-overflow-fix.patch
-
-  ./configure --prefix=/usr \
-    --with-cairo \
-    --with-python \
-    --disable-gnome \
-    --with-hardbooks
-  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
-  make
-  cd doc
-  make html
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  cd doc
-  make DESTDIR="${pkgdir}" install-html
-  ln -sf dia/html "${pkgdir}"/usr/share/dia/help
-}
diff --git a/community-staging/dia/dia-overflow-fix.patch b/community-staging/dia/dia-overflow-fix.patch
deleted file mode 100644
index a6e64f3c6..000000000
--- a/community-staging/dia/dia-overflow-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -wbBur dia-0.97.1/plug-ins/xfig/xfig-export.c dia-0.97.1.my/plug-ins/xfig/xfig-export.c
---- dia-0.97.1/plug-ins/xfig/xfig-export.c	2009-11-07 17:28:34.000000000 +0300
-+++ dia-0.97.1.my/plug-ins/xfig/xfig-export.c	2010-11-15 17:44:05.640896280 +0300
-@@ -417,6 +417,9 @@
-     if (text[i] > 127) {
-       newlen += 3;
-     }
-+    if (text[i] == '\\') {
-+      newlen += 1;
-+    }
-   }
-   returntext = g_malloc(sizeof(char)*(newlen+1));
-   j = 0;
-@@ -1085,10 +1088,10 @@
-   figtext = figText(renderer, (unsigned char *) text);
-   /* xfig texts are specials */
-   fprintf(renderer->file, "4 %d %d %d 0 %d %s 0.0 6 0.0 0.0 %d %d %s\\001\n",
--	  figAlignment(renderer, alignment),
--	  figColor(renderer, color), 
--	  figDepth(renderer),
--	  figFont(renderer),
-+	  (int)figAlignment(renderer, alignment),
-+	  (int)figColor(renderer, color), 
-+	  (int)figDepth(renderer),
-+	  (int)figFont(renderer),
- 	  xfig_dtostr(d_buf, figFontSize(renderer)),
- 	  (int)figCoord(renderer, pos->x),
- 	  (int)figCoord(renderer, pos->y),
diff --git a/community-staging/dia/dia.install b/community-staging/dia/dia.install
deleted file mode 100644
index a49438e1f..000000000
--- a/community-staging/dia/dia.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/dillo/PKGBUILD b/community-staging/dillo/PKGBUILD
deleted file mode 100644
index 0bd758f9a..000000000
--- a/community-staging/dillo/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62398 2012-01-19 19:37:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=dillo
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="A small, fast graphical web browser built on FLTK"
-arch=(i686 x86_64)
-url="http://www.dillo.org"
-license=('GPL')
-depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor'
-         'libxi' 'libxinerama')
-backup=(etc/dillo/{dillorc,dpidrc})
-source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('81b82112cefcc7d54fe2972a21f42930')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \
-              --enable-ssl
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community-staging/directfb/DirectFB-1.4.9-libpng-1.5.patch
deleted file mode 100644
index e428afbaf..000000000
--- a/community-staging/directfb/DirectFB-1.4.9-libpng-1.5.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Feb 2011 19:18:19 -0500
-Subject: [PATCH] png: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- .../idirectfbimageprovider_png.c                   |   56 ++++++++++++-------
- 1 files changed, 35 insertions(+), 21 deletions(-)
-
-diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-index 6d65ea3..7d82c5c 100644
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
-      if (!data->png_ptr)
-           goto error;
- 
--     if (setjmp( data->png_ptr->jmpbuf )) {
-+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
-           D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
-           goto error;
-      }
-@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-           rect = dst_data->area.wanted;
-      }
- 
--     if (setjmp( data->png_ptr->jmpbuf )) {
-+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
-           D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
- 
-           if (data->stage < STAGE_IMAGE)
-@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-      }
-      else {
-           CoreSurfaceBufferLock lock;
-+          png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
- 
-           ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
-           if (ret)
-@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
- 
-           switch (data->color_type) {
-                case PNG_COLOR_TYPE_PALETTE:
--                    if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
-+                    if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
-                          /*
-                           * Special indexed PNG to LUT8 loading.
-                           */
-@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-                     }
-                     else {
-                          if (data->color_type == PNG_COLOR_TYPE_GRAY) {
--                              int num = 1 << data->info_ptr->bit_depth;
-+                              int num = 1 << bit_depth;
- 
-                               for (x=0; x<num; x++) {
-                                    int value = x * 255 / (num - 1);
-@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-                               }
-                          }
- 
--                         switch (data->info_ptr->bit_depth) {
-+                         switch (bit_depth) {
-                               case 8:
-                                    for (y=0; y<data->height; y++) {
-                                         u8  *S = data->image + data->pitch * y;
-@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
- 
-                               default:
-                                    D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
--                                            data->info_ptr->bit_depth );
-+                                            bit_depth );
-                          }
- 
-                          dfb_scale_linear_32( image_argb, data->width, data->height,
-@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
-                    NULL, NULL, NULL );
- 
-      if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
-+          png_bytep     trans;
-+          png_color_16p trans_color;
-+          int           num_trans;
-+
-+          png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
-+
-           data->color_keyed = true;
- 
-           /* generate color key based on palette... */
-           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
-                u32        key;
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_colors = MIN( MAXCOLORMAPSIZE,
--                                            data->info_ptr->num_palette );
--               u8         cmap[3][num_colors];
-+               png_colorp palette;
-+               int        num_colors;
-+               u8        *cmap[3];
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               cmap[0] = alloca (num_colors);
-+               cmap[1] = alloca (num_colors);
-+               cmap[2] = alloca (num_colors);
- 
-                for (i=0; i<num_colors; i++) {
-                     cmap[0][i] = palette[i].red;
-@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
- 
-                key = FindColorKey( num_colors, &cmap[0][0] );
- 
--               for (i=0; i<data->info_ptr->num_trans; i++) {
-+               for (i=0; i<num_trans; i++) {
-                     if (!trans[i]) {
-                          palette[i].red   = (key & 0xff0000) >> 16;
-                          palette[i].green = (key & 0x00ff00) >>  8;
-@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
-           }
-           else {
-                /* ...or based on trans rgb value */
--               png_color_16p trans = &data->info_ptr->trans_color;
--
--               data->color_key = (((trans->red & 0xff00) << 8) |
--                                  ((trans->green & 0xff00)) |
--                                  ((trans->blue & 0xff00) >> 8));
-+               data->color_key = (((trans_color->red & 0xff00) << 8) |
-+                                  ((trans_color->green & 0xff00)) |
-+                                  ((trans_color->blue & 0xff00) >> 8));
-           }
-      }
- 
-      switch (data->color_type) {
-           case PNG_COLOR_TYPE_PALETTE: {
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_trans  = data->info_ptr->num_trans;
--               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
-+               png_colorp    palette;
-+               png_bytep     trans;
-+               png_color_16p trans_color;
-+               int           num_trans;
-+               int           num_colors;
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
- 
-                for (i=0; i<num_colors; i++) {
-                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
--- 
-1.7.4.1
-
-From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Feb 2011 19:38:50 -0500
-Subject: [PATCH] tools: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tools/directfb-csource.c |   20 +++++++++++++-------
- tools/mkdfiff.c          |    2 +-
- tools/mkdgifft.cpp       |    2 +-
- 3 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
-index 8f2cbf0..487ea3c 100644
---- a/tools/directfb-csource.c
-+++ b/tools/directfb-csource.c
-@@ -338,7 +338,7 @@ static DFBResult load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
-@@ -405,17 +405,22 @@ static DFBResult load_image (const char            *filename,
-        }
- 
-      switch (src_format) {
--          case DSPF_LUT8:
--               if (info_ptr->num_palette) {
-+          case DSPF_LUT8: {
-+               png_colorp png_palette;
-+               int        num_palette;
-+
-+               png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
-+
-+               if (num_palette) {
-                     png_byte *alpha;
-                     int       i, num;
- 
--                    *palette_size = MIN (info_ptr->num_palette, 256);
-+                    *palette_size = MIN (num_palette, 256);
-                     for (i = 0; i < *palette_size; i++) {
-                          palette[i].a = 0xFF;
--                         palette[i].r = info_ptr->palette[i].red;
--                         palette[i].g = info_ptr->palette[i].green;
--                         palette[i].b = info_ptr->palette[i].blue;
-+                         palette[i].r = png_palette[i].red;
-+                         palette[i].g = png_palette[i].green;
-+                         palette[i].b = png_palette[i].blue;
-                     }
-                     if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
-                          png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
-@@ -424,6 +429,7 @@ static DFBResult load_image (const char            *filename,
-                     }
-                }
-                break;
-+          }
-           case DSPF_RGB32:
-                 png_set_filler (png_ptr, 0xFF,
- #ifdef WORDS_BIGENDIAN
-diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
-index 68a3b4f..edb58a7 100644
---- a/tools/mkdfiff.c
-+++ b/tools/mkdfiff.c
-@@ -97,7 +97,7 @@ load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
-diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
-index 96e4220..d4b6bf4 100644
---- a/tools/mkdgifft.cpp
-+++ b/tools/mkdgifft.cpp
-@@ -595,7 +595,7 @@ load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
--- 
-1.7.4.1
-
diff --git a/community-staging/directfb/PKGBUILD b/community-staging/directfb/PKGBUILD
deleted file mode 100644
index 8232fd4df..000000000
--- a/community-staging/directfb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62433 2012-01-20 01:45:50Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=directfb
-pkgver=1.4.14
-pkgrel=2
-pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
-arch=('i686' 'x86_64')
-url="http://www.directfb.org"
-license=('LGPL')
-depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
-options=('!libtool')
-changelog=$pkgname.changelog
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz DirectFB-1.4.9-libpng-1.5.patch)
-md5sums=('de0745d25a6ac9e337d4d5572df85471'
-         '84f3181e96692efc5ff68e5dac19541f')
-
-build() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \
-              --enable-x11 --enable-sdl --disable-vnc --disable-osx \
-              --enable-video4linux2 --enable-voodoo
-  make
-} 
-
-package() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/directfb/directfb.changelog b/community-staging/directfb/directfb.changelog
deleted file mode 100644
index 721fd1deb..000000000
--- a/community-staging/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-staging/djview4/PKGBUILD b/community-staging/djview4/PKGBUILD
deleted file mode 100644
index a2600bec6..000000000
--- a/community-staging/djview4/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 62347 2012-01-19 14:18:32Z bisson $
-# Contributor: Paulo Matias <matias.archlinux-br.org>
-# Contributor: Leslie P. Polzer <polzer.gnu.org>
-# Contributor: erm67 <erm67.yahoo.it>
-# Contributor: Daniel J Griffiths
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=djview4
-pkgver=4.8
-pkgrel=2
-pkgdesc='Portable DjVu viewer and browser plugin'
-url='http://djvu.sourceforge.net/djview4.html'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qt' 'djvulibre')
-source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
-sha1sums=('266d207afb63a1ee63eed054190bf88888fda572')
-
-install=install
-
-build() {
-	cd "${srcdir}/djview-${pkgver}"
-	QTDIR=/usr ./configure --prefix=/usr
-	sed 's/netscape/mozilla/g' -i nsdejavu/Makefile
-	sed 's/swap/rofl_swap/g' -i src/qdjvuwidget.cpp
-	make
-}
-
-package() {
-	cd "${srcdir}/djview-${pkgver}"
-	make DESTDIR="${pkgdir}" install-djview install-nsdejavu
-
-	cd desktopfiles
-	install -Dm644 hi32-djview4.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/djvulibre-djview4.png
-	install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/djvulibre-djview4.png
-	install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/pixmaps/djvulibre-djview4.png
-	install -Dm644 djvulibre-djview4.desktop "${pkgdir}"/usr/share/applications/djvulibre-djview4.desktop
-}
diff --git a/community-staging/djview4/install b/community-staging/djview4/install
deleted file mode 100644
index f2bd04ceb..000000000
--- a/community-staging/djview4/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	if type xdg-icon-resource &>/dev/null; then
-		xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	fi
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-staging/dosbox/PKGBUILD b/community-staging/dosbox/PKGBUILD
deleted file mode 100644
index 7c8e8f2b1..000000000
--- a/community-staging/dosbox/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 62786 2012-01-26 20:55:35Z ebelanger $
-# Maintainer :
-# Contribute : Jelle van der Waa <jelle@vdwaa.nl>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=dosbox
-pkgver=0.74
-pkgrel=3
-pkgdesc="An emulator with builtin DOS for running DOS Games"
-arch=('i686' 'x86_64')
-url="http://dosbox.sourceforge.net/"
-license=('GPL')
-depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
-	'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
-
-build(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  sed -i 's/png_check_sig/png_sig_cmp/' configure 
-  ./configure   --prefix=/usr \
-    --sysconfdir=/etc/dosbox  
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-
-
-  # install docs, make does not install them
-  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
-  install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video
-
-  install -Dm644 "${srcdir}/${pkgname}.png" \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
-md5sums=('b9b240fa87104421962d14eee71351e8'
-         '2aac25fc06979e375953fcc36824dc5e'
-         '85169ca599028bee8e29e0b3b7b34dd8'
-         '3fba2e3c7c43290319b2928f40ed30e5')
diff --git a/community-staging/dosbox/dosbox.desktop b/community-staging/dosbox/dosbox.desktop
deleted file mode 100644
index dbaf05ced..000000000
--- a/community-staging/dosbox/dosbox.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=dosbox Emulator
-GenericName=Emulator
-Comment=An emulator to run old DOS games
-Icon=dosbox
-Exec=dosbox
-Terminal=false
-Categories=Emulator;Application;
diff --git a/community-staging/dosbox/dosbox.png b/community-staging/dosbox/dosbox.png
deleted file mode 100644
index b8a917986..000000000
--- a/community-staging/dosbox/dosbox.png
+++ /dev/null
diff --git a/community-staging/dosbox/gcc46.patch b/community-staging/dosbox/gcc46.patch
deleted file mode 100644
index eae9ae63e..000000000
--- a/community-staging/dosbox/gcc46.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
---- dosbox-0.74/include/dos_inc.h	2010-05-10 17:43:54.000000000 +0000
-+++ dosbox-0.74.new//include/dos_inc.h	2011-06-17 20:42:43.982548979 +0000
-@@ -28,6 +28,8 @@
- #include "mem.h"
- #endif
- 
-+#include <stddef.h> //for offsetof
-+
- #ifdef _MSC_VER
- #pragma pack (1)
- #endif
diff --git a/community-staging/dsniff/PKGBUILD b/community-staging/dsniff/PKGBUILD
deleted file mode 100644
index cd45f4e70..000000000
--- a/community-staging/dsniff/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 61459 2011-12-31 21:13:32Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: ViNS <gladiator@fastwebnet.it>
-
-pkgname=dsniff
-pkgver=2.4b1
-pkgrel=21
-pkgdesc="Collection of tools for network auditing and penetration testing"
-url="http://www.monkey.org/~dugsong/dsniff/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids')
-source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
-        "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz")
-md5sums=('2f761fa3475682a7512b0b43568ee7d6'
-         'fbc9f62f9ab2f98f24f53ad497c1ce5d')
-
-build() {
-  cd $srcdir/$pkgname-2.4
-  patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff
-  for i in *.dpatch; do
-    patch -N < "$i"
-  done
-
-  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-2.4
-  make prefix="$pkgdir"/usr install
-  install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
-
-  install -d "$pkgdir"/usr/share
-  mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
-}
diff --git a/community-staging/efax-gtk/PKGBUILD b/community-staging/efax-gtk/PKGBUILD
deleted file mode 100644
index faf04dd39..000000000
--- a/community-staging/efax-gtk/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62427 2012-01-19 22:13:20Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=efax-gtk
-pkgver=3.2.9
-pkgrel=2
-pkgdesc="A GUI front end for the 'efax' fax program"
-arch=('i686' 'x86_64')
-url="http://efax-gtk.sourceforge.net/"
-license=('GPL')
-depends=('dbus-glib' 'ghostscript' 'c++-gtk-utils')
-makedepends=('pkg-config')
-optdepends=('heirloom-mailx: to use the mail_fax script')
-backup=('etc/efax-gtkrc')
-install=efax-gtk.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz")
-md5sums=('57fac8815c8f49fc7415d3558eb3f842')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --with-spooldir=/usr/bin
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -m 755 mail_fax print_fax "${pkgdir}/usr/bin"
-}
diff --git a/community-staging/efax-gtk/efax-gtk.install b/community-staging/efax-gtk/efax-gtk.install
deleted file mode 100644
index 69e30acd6..000000000
--- a/community-staging/efax-gtk/efax-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}
diff --git a/community-staging/emerald/PKGBUILD b/community-staging/emerald/PKGBUILD
deleted file mode 100644
index ced82dae0..000000000
--- a/community-staging/emerald/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 62984 2012-01-30 04:32:09Z ebelanger $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=emerald
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Emerald window decorator"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \
-         'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkg-config' 'gettext')
-groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
-options=(!libtool)
-conflicts=('emerald-git')
-install=emerald.install
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  LIBS+="-lm -ldl" ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/emerald/deprecated_symbols.patch b/community-staging/emerald/deprecated_symbols.patch
deleted file mode 100644
index b32ce154a..000000000
--- a/community-staging/emerald/deprecated_symbols.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001
-From: ShadowKyogre <shadowkyogre@aim.com>
-Date: Fri, 05 Nov 2010 01:53:24 +0000
-Subject: Fix deprecated symbols and incorrect decoration property setting
-
----
-diff --git a/src/main.c b/src/main.c
-index 5f0ec35..150da99 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -27,8 +27,8 @@
- #include <emerald.h>
- #include <engine.h>
- 
--#define BASE_PROP_SIZE 12
--#define QUAD_PROP_SIZE 9
-+//#define BASE_PROP_SIZE 12
-+//#define QUAD_PROP_SIZE 9
- 
- #ifndef DECOR_INTERFACE_VERSION
- #define DECOR_INTERFACE_VERSION 0
-@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val)
-     gdk_error_trap_push();
- 
-     type = None;
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow,
- 				atom,
- 				0, G_MAXLONG,
-@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push();
--    XSetTransientForHint(gdk_display,
-+    XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			 GDK_WINDOW_XID(dialog->window),
- 			 wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow)
-     int format, result;
-     char *retval;
- 
--    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push();
- 
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow, atom,
- 				0, G_MAXLONG,
- 				FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win)
-     }
- 
-     gdk_error_trap_push();
--    XKillClient(gdk_display, wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius,
- 
- static int update_shadow(frame_settings * fs)
- {
--    Display *xdisplay = gdk_display;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     XRenderPictFormat *format;
-     GdkPixmap *pixmap;
-     Picture src, dst, tmp;
---
-cgit v0.8.3.1-30-gff3a
-
---- a/src/main.c.old	2010-12-07 19:56:08.633333370 +0100
-+++ a/src/main.c	2010-12-07 19:56:39.273333379 +0100
-@@ -3757,7 +3757,7 @@
- 
- static void hide_tooltip(void)
- {
--    if (GTK_WIDGET_VISIBLE(tip_window))
-+    if (gtk_widget_get_visible (tip_window))
- 	g_get_current_time(&tooltip_last_popdown);
- 
-     gtk_widget_hide(tip_window);
-
---- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
-+++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 
-01:20:03.046827674 -0500
-@@ -461,7 +461,7 @@
- }
- gdouble get_float(SettingItem * item)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
-     }
-     else {
-@@ -647,7 +647,7 @@
- }
- void set_float(SettingItem * item, gdouble f)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
-     } 
-     else {
-
diff --git a/community-staging/emerald/emerald.install b/community-staging/emerald/emerald.install
deleted file mode 100644
index c2fa624ae..000000000
--- a/community-staging/emerald/emerald.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/evas-svn/PKGBUILD b/community-staging/evas-svn/PKGBUILD
deleted file mode 100644
index ef4748be8..000000000
--- a/community-staging/evas-svn/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 62866 2012-01-28 03:10:42Z ebelanger $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=evas-svn
-pkgver=66901
-pkgrel=2
-pkgdesc="A hardware-accelerated canvas API for X-Windows"
-arch=('i686' 'x86_64')
-groups=('e17-libs-svn' 'e17-svn')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('giflib' 'librsvg' 'eet-svn' 'cairo' 'libjpeg' 'libxrender' 'mesa' 
-	'fribidi' 'fontconfig')
-makedepends=('subversion')
-conflicts=('evas')
-provides=('evas')
-options=('!libtool' '!emptydirs')
-md5sums=()
-         
-_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas"
-_svnmod="evas"
-
-build() {
-   cd "$srcdir"
-
-msg "Connecting to $_svntrunk SVN server...."
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  ./autogen.sh --prefix=/usr --enable-fb --enable-xrender-x11 \
-	--enable-gl-x11 --enable-fontconfig --enable-async-preload \
-	--enable-async-events --enable-pipe-render --enable-async-render
-  make
-}
-
-package() {
-  cd "$srcdir/$_svnmod-build"
-  make DESTDIR="$pkgdir" install
-
-# install license files
-  install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  rm -r "$srcdir/$_svnmod-build"
-
-}
diff --git a/community-staging/extremetuxracer/PKGBUILD b/community-staging/extremetuxracer/PKGBUILD
deleted file mode 100644
index 5bf9f56b3..000000000
--- a/community-staging/extremetuxracer/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 62790 2012-01-26 23:54:14Z arodseth $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Eric Belanger <eric.archlinux.org>
-# Contributor: Fabio Scotoni <CCuleX.gmail.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=extremetuxracer
-pkgver=0.4
-pkgrel=3
-pkgdesc="Downhill racing game starring Tux"
-arch=('x86_64' 'i686')
-url="http://www.extremetuxracer.com"
-license=('GPL')
-depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu')
-conflicts=('ppracer' 'etracer')
-replaces=('ppracer' 'etracer')
-source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
-       "$pkgname.png"
-       "$pkgname.desktop"
-       "libpng15.patch")
-sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
-            'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
-            '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
-            '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
-
-build() {
-  cd "$srcdir/extremetuxracer-$pkgver"
-
-  patch -Np1 -i ${srcdir}/libpng15.patch
-  sed -i -e 's/libpng12/libpng15/g' configure
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/extremetuxracer-$pkgver"
-  make DESTDIR="$pkgdir" install
-
- # Install icon and desktop file
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/extremetuxracer/extremetuxracer.desktop b/community-staging/extremetuxracer/extremetuxracer.desktop
deleted file mode 100644
index 6593607b8..000000000
--- a/community-staging/extremetuxracer/extremetuxracer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=Extreme Tux Racer
-Comment=Open source racing game featuring Tux the Linux Penguin. 
-Icon=/usr/share/pixmaps/extremetuxracer.png
-Exec=etracer
-Terminal=false
-StartupNotify=true
-Categories=Application;Game;ArcadeGame
-
diff --git a/community-staging/extremetuxracer/extremetuxracer.png b/community-staging/extremetuxracer/extremetuxracer.png
deleted file mode 100644
index 6c4aec00b..000000000
--- a/community-staging/extremetuxracer/extremetuxracer.png
+++ /dev/null
diff --git a/community-staging/extremetuxracer/libpng15.patch b/community-staging/extremetuxracer/libpng15.patch
deleted file mode 100644
index 5c9999857..000000000
--- a/community-staging/extremetuxracer/libpng15.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
-+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
-@@ -53,7 +53,7 @@
-     if (!info_ptr)
-     {
-         png_destroy_read_struct(&png_ptr,
--           (png_infopp)NULL, (png_infopp)NULL);
-+           NULL, NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -62,7 +62,7 @@
-     if (!end_info)
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr,
--          (png_infopp)NULL);
-+          NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -77,7 +77,7 @@
- 	
- 	
- 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
--       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+       &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	
- 	if(bit_depth == 16)
-         png_set_strip_16(png_ptr);
-@@ -88,7 +88,7 @@
- 		png_set_expand(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 	
- 	if( color_type == PNG_COLOR_TYPE_GRAY ||
-@@ -96,7 +96,7 @@
- 		png_set_gray_to_rgb(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 		
- 	this->width=width;
-@@ -114,7 +114,7 @@
- 	}
- 	
- 	png_read_end(png_ptr, info_ptr);
--	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 	fclose(fp);
- }
- 
diff --git a/community-staging/fbgrab/PKGBUILD b/community-staging/fbgrab/PKGBUILD
deleted file mode 100644
index 2c19d04c5..000000000
--- a/community-staging/fbgrab/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 62335 2012-01-19 09:22:30Z spupykin $
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-pkgname=fbgrab
-pkgver=1.0
-pkgrel=6
-pkgdesc="A framebuffer screenshot grabber"
-arch=(i686 x86_64)
-url="http://hem.bredband.net/gmogmo/fbgrab/"
-license=("GPL")
-depends=('libpng')
-makedepends=('libpng')
-source=(http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz)
-md5sums=('7af4d8774684182ed690d5da82d6d234')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i '1,1i#include <zlib.h>' fbgrab.c
-  gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-  strip fbgrab
-  install -D -m755 $startdir/src/$pkgname-$pkgver/fbgrab $startdir/pkg/usr/bin/fbgrab
-  install -D -m644 $startdir/src/$pkgname-$pkgver/fbgrab.1.man $startdir/pkg/usr/share/man/man1/fbgrab.1
-}
diff --git a/community-staging/fbreader/PKGBUILD b/community-staging/fbreader/PKGBUILD
deleted file mode 100644
index 3f0e64cc3..000000000
--- a/community-staging/fbreader/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 62331 2012-01-19 09:20:32Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=fbreader
-pkgver=0.12.10
-pkgrel=3
-pkgdesc="An e-book reader for Linux"
-arch=('i686' 'x86_64')
-url="http://www.fbreader.org/"
-license=('GPL')
-depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3')
-source=(http://www.fbreader.org/files/sources/fbreader-sources-$pkgver.tgz
-	build-fix.patch)
-md5sums=('da9ec4721efdb0ec0aaa182bff16ad82'
-         '66ac17d8640625b6d2a806de4aa4e76c')
-
-build() {
-  export CPPFLAGS="-I/usr/include/cairo"
-  export TARGET_ARCH=desktop
-  export UI_TYPE=gtk
-  export TARGET_STATUS=release
-  export srcdir
-
-  cd $srcdir/fbreader-$pkgver
-  patch -p0 makefiles/config.mk <$srcdir/build-fix.patch
-  sed -i 's#Library::Library &Library::Instance()#Library \&Library::Instance()#' fbreader/src/library/Library.cpp
-  make INSTALLDIR=/usr
-  make INSTALLDIR=/usr DESTDIR=$pkgdir install
-}
diff --git a/community-staging/fbreader/build-fix.patch b/community-staging/fbreader/build-fix.patch
deleted file mode 100644
index 7316464b8..000000000
--- a/community-staging/fbreader/build-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.mk.orig	2010-02-23 18:22:10.000000000 +0000
-+++ config.mk	2010-02-28 13:55:11.000000000 +0000
-@@ -21,7 +21,7 @@
- ARCHIVER_LIBS ?= -lz -lbz2
- NETWORK_LIBS ?= -lcurl
- 
--CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
-+CFLAGS += -I$(srcdir)/liblinebreak-20080321 -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
- ifeq "$(ZLSHARED)" "yes"
-   CFLAGS += -fPIC -DZLSHARED
- endif
-@@ -38,6 +38,8 @@
- 	LDFLAGS += -pg
- endif
- 
-+LDFLAGS += -L$(srcdir)/liblinebreak-20080321/DebugDir
-+
- ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
- 
- ZLSHARED ?= yes
diff --git a/community-staging/fbshot/PKGBUILD b/community-staging/fbshot/PKGBUILD
deleted file mode 100644
index b807e4e09..000000000
--- a/community-staging/fbshot/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 62337 2012-01-19 09:23:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: sp42b <sp42b|a_t|gmx.net>
-
-pkgname=fbshot
-pkgver=0.3
-pkgrel=4
-pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)."
-arch=('i686' 'x86_64')
-url="http://www.sfires.net/fbshot/"
-license=('GPL')
-depends=('libpng')
-source=(http://www.sfires.net/stuff/fbshot/$pkgname-$pkgver.tar.gz)
-md5sums=('2cc6cc25cdc4cd447a8b0a9662907635')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i '1,1i#include <zlib.h>' fbshot.c
-  make
-  install -Dm755 fbshot $pkgdir/usr/bin/fbshot
-  install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1
-}
diff --git a/community-staging/fbv/ChangeLog b/community-staging/fbv/ChangeLog
deleted file mode 100644
index 7fd5bbf99..000000000
--- a/community-staging/fbv/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/community-staging/fbv/PKGBUILD b/community-staging/fbv/PKGBUILD
deleted file mode 100644
index 53fb5d756..000000000
--- a/community-staging/fbv/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 62339 2012-01-19 09:24:56Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Aectann <aectann@infoline.su>
-
-pkgname=fbv
-pkgver=1.0b
-pkgrel=5
-pkgdesc="FrameBuffer image viewer"
-arch=('i686' 'x86_64')
-url="http://s-tech.elsat.net.pl/fbv/"
-license=('GPL')
-depends=('libpng' 'libungif' 'libjpeg')
-source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz)
-md5sums=('3e466375b930ec22be44f1041e77b55d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf
-  sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
-  make
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/usr/share/man/man1
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/fityk/PKGBUILD b/community-staging/fityk/PKGBUILD
deleted file mode 100644
index 9c95247c7..000000000
--- a/community-staging/fityk/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Cuneyt Unlu <unlucu AT gmail.com>
-
-pkgname=fityk
-pkgver=1.1.1
-pkgrel=4
-pkgdesc='A program for nonlinear fitting of analytical functions to data.'
-arch=('i686' 'x86_64')
-url='http://www.unipress.waw.pl/fityk/'
-license=('GPL')
-depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot' 'desktop-file-utils') # wxgtk supplied by statically linked wxWidgets
-makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion')
-options=('!libtool')
-install='fityk.install'
-
-build() {
-  # daily snapshot because fityk requires a version that hasn't been released yet...
-  svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
-
-  cd wxWidgets
-  ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
-  make
-  make install
-
-  cd ${srcdir}
-  git clone git://github.com/wojdyr/fityk.git
-  cd fityk
-  git checkout v${pkgver}
-  #cd ${pkgname}-${pkgver}
-
-  # disable xyconvert because wxwidgets>=2.9 is needed (dev version) and it isn't standard with arch yet
-    #--disable-xyconvert \
-  ./autogen.sh \
-    --prefix=/usr \
-    --without-doc \
-    --with-wx-prefix=${srcdir}/usr
-  #./configure \
-
-  make
-}
-
-package() {
-  cd fityk
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/fityk/fityk.install b/community-staging/fityk/fityk.install
deleted file mode 100644
index df476d572..000000000
--- a/community-staging/fityk/fityk.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-mime-database /usr/share/mime
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-mime-database /usr/share/mime
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-mime-database /usr/share/mime
-  update-desktop-database -q
-}
diff --git a/community-staging/flam3/PKGBUILD b/community-staging/flam3/PKGBUILD
deleted file mode 100644
index d81af3d7c..000000000
--- a/community-staging/flam3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 62278 2012-01-18 22:53:38Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=flam3
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
-arch=('i686' 'x86_64')
-url="http://flam3.com/"
-license=('GPL3')
-depends=('libjpeg' 'libpng' 'libxml2')
-options=('!libtool')
-source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch)
-sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9'
-          '17ece6cc00899e5135dad2bc79f97dfbd73107a6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  patch -p1 -i ../../flam3-3.0.1-libpng15.patch
-  ./configure --prefix=/usr --enable-shared
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/flam3/flam3-3.0.1-libpng15.patch b/community-staging/flam3/flam3-3.0.1-libpng15.patch
deleted file mode 100644
index 61f905589..000000000
--- a/community-staging/flam3/flam3-3.0.1-libpng15.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-http://code.google.com/p/flam3/issues/detail?id=8
-
---- src/png.c
-+++ src/png.c
-@@ -142,7 +142,7 @@
-   }
-   if (setjmp(png_jmpbuf(png_ptr))) {
-      if (png_image) {
--	 for (y = 0 ; y < info_ptr->height ; y++)
-+	 for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
- 	     free (png_image[y]);
- 	 free (png_image);
-      }
-@@ -161,19 +161,19 @@
-   png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
-   png_read_info (png_ptr, info_ptr);
- 
--  if (8 != info_ptr->bit_depth) {
-+  if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
-     fprintf(stderr, "bit depth type must be 8, not %d.\n",
--	    info_ptr->bit_depth);
-+	    png_get_bit_depth(png_ptr, info_ptr));
-     return 0;
-   }
- 
--  *width = info_ptr->width;
--  *height = info_ptr->height;
-+  *width = png_get_image_width(png_ptr, info_ptr);
-+  *height = png_get_image_height(png_ptr, info_ptr);
-   p = q = malloc(4 * *width * *height);
--  png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
-+  png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*));
- 
--  linesize = info_ptr->width;
--  switch (info_ptr->color_type) {
-+  linesize = png_get_image_width(png_ptr, info_ptr);
-+  switch (png_get_color_type(png_ptr, info_ptr)) {
-     case PNG_COLOR_TYPE_RGB:
-       linesize *= 3;
-       break;
-@@ -182,21 +182,21 @@
-       break;
-   default:
-     fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
--	    info_ptr->color_type);
-+	    png_get_color_type(png_ptr, info_ptr));
-     return 0;
-   }
- 
--  for (y = 0 ; y < info_ptr->height ; y++) {
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
-     png_image[y] = malloc (linesize);
-   }
-   png_read_image (png_ptr, png_image);
-   png_read_end (png_ptr, info_ptr);
- 
--  for (y = 0 ; y < info_ptr->height ; y++) {
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
-     unsigned char *s = png_image[y];
--    for (x = 0 ; x < info_ptr->width ; x++) {
-+    for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) {
- 
--      switch (info_ptr->color_type) {
-+      switch (png_get_color_type(png_ptr, info_ptr)) {
-       case PNG_COLOR_TYPE_RGB:
- 	p[0] = s[0];
- 	p[1] = s[1];
-@@ -217,7 +217,7 @@
-     }
-   }
- 
--  for (y = 0 ; y < info_ptr->height ; y++)
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
-     free (png_image[y]);
-   free (png_image);
-   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
diff --git a/community-staging/flowcanvas/PKGBUILD b/community-staging/flowcanvas/PKGBUILD
deleted file mode 100644
index fe31327e7..000000000
--- a/community-staging/flowcanvas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 62969 2012-01-29 17:00:37Z svenstaro $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Max a.k.a. Synthead <synthead@gmail.com>
-# Contributor: christhemonkey <christhemonkey at gmail dot com>
-
-pkgname=flowcanvas
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments"
-arch=('i686' 'x86_64')
-url="http://drobilla.net/software/flowcanvas/"
-depends=('libgnomecanvasmm' 'graphviz')
-makedepends=('boost' 'python2')
-license=('GPL')
-install=$pkgname.install
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('a4908f6385ce9fd2ce97c8caa823f053')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/flowcanvas/flowcanvas.install b/community-staging/flowcanvas/flowcanvas.install
deleted file mode 100644
index dbd9898d3..000000000
--- a/community-staging/flowcanvas/flowcanvas.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  \ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/fltk2/PKGBUILD b/community-staging/fltk2/PKGBUILD
deleted file mode 100644
index 4df613913..000000000
--- a/community-staging/fltk2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62329 2012-01-19 09:03:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=fltk2
-pkgver=2.0
-_pkgver=2.0.x-alpha-r9166
-pkgrel=8
-pkgdesc="Graphical user interface toolkit for X"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.fltk.org/"
-depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama')
-makedepends=('mesa')
-source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2)
-md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa')
-
-build() {
-  cd $srcdir/fltk-${_pkgver}
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  patch -p0 src/filename_list.cxx <<EOF
-66c66
-<   int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
----
->   int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort);
-EOF
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/fox/PKGBUILD b/community-staging/fox/PKGBUILD
deleted file mode 100644
index 8c087c309..000000000
--- a/community-staging/fox/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62305 2012-01-19 07:32:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=fox
-pkgver=1.6.44
-pkgrel=2
-pkgdesc="Free Objects for X: GUI Toolkit for C++"
-arch=('i686' 'x86_64')
-url="http://www.fox-toolkit.org/"
-license=('LGPL' 'custom')
-depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff')
-optdepends=('perl')
-options=('!libtool')
-source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
-md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-  ./configure   --prefix=/usr \
-                --enable-release \
-                --with-xft=yes \
-                --with-opengl=yes \
-                --with-xim \
-                --with-xshm \
-                --with-shape \
-                --with-xcursor \
-                --with-xrender \
-                --with-xrandr \
-                --with-xfixes \
-                --with-xinput
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  cd ${srcdir}/${pkgname}-${pkgver}/tests
-  make ControlPanel
-  install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/
-  install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-staging/freedroidrpg/PKGBUILD b/community-staging/freedroidrpg/PKGBUILD
deleted file mode 100644
index 1b8ac1ed3..000000000
--- a/community-staging/freedroidrpg/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 62710 2012-01-24 22:18:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: nut543 <kfs1@online.no>
-
-#pkgbase=freedroidrpg
-#pkgname=('freedroidrpg' 'freedroidrpg-data')
-pkgname='freedroidrpg'
-pkgver=0.15
-pkgrel=2
-arch=('i686' 'x86_64')
-# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
-depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa')
-optdepends=('python2' 'espeak')
-pkgdesc="a mature science fiction role playing game set in the future"
-url="http://freedroid.sourceforge.net"
-license=("GPL")
-source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz
-	freedroidrpg.jpg
-	freedroidrpg.desktop)
-md5sums=('003a3f34619cfaa87add2030fea5d120'
-         'b73d9dac44c7e83a6c80fbe4eb96ba79'
-         '9a10c2a2064439cdcff5b945dfb1c3ac')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-  install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg
-  install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop
-}
diff --git a/community-staging/freedroidrpg/freedroidrpg.desktop b/community-staging/freedroidrpg/freedroidrpg.desktop
deleted file mode 100644
index 33ee2f5b8..000000000
--- a/community-staging/freedroidrpg/freedroidrpg.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=freedroidrpg
-Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG
-Exec=freedroidRPG
-Encoding=UTF-8
-Icon=/usr/share/icons/freedroidrpg.jpg
-Categories=Game;RolePlaying;
-Terminal=false
-StartupNotify=false
diff --git a/community-staging/freedroidrpg/freedroidrpg.jpg b/community-staging/freedroidrpg/freedroidrpg.jpg
deleted file mode 100644
index 4daa89313..000000000
--- a/community-staging/freedroidrpg/freedroidrpg.jpg
+++ /dev/null
diff --git a/community-staging/freewrl/PKGBUILD b/community-staging/freewrl/PKGBUILD
deleted file mode 100644
index 4399a72f2..000000000
--- a/community-staging/freewrl/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 62333 2012-01-19 09:21:12Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=freewrl
-pkgver=1.22.10
-pkgrel=8
-pkgdesc="VRML viewer"
-arch=('i686' 'x86_64')
-url="http://freewrl.sourceforge.net/"
-license=('GPL')
-depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox'
-	 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js')
-makedepends=('java-environment')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	build-fix.patch)
-md5sums=('07fd8f193d14799ffb95a59a4887fc88'
-         '52e4b6aacebcaf18cbec8975e0eb7fd8')
-
-build() {
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
-  export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-  export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185"
-  ./configure \
-    --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \
-    --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \
-    --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \
-    --disable-seamonkey-js
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/freewrl/build-fix.patch b/community-staging/freewrl/build-fix.patch
deleted file mode 100644
index c0de71d07..000000000
--- a/community-staging/freewrl/build-fix.patch
+++ /dev/null
@@ -1,1201 +0,0 @@
-diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c
---- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c	2010-08-19 06:20:36.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c	2011-07-04 01:19:07.000000000 +0400
-@@ -54,7 +54,7 @@
- #include "ColladaParser.h"
- 
- #if HAVE_EXPAT_H
--# include <expat.h>
-+# include </usr/include/expat.h>
- #endif
- 
- #define PROTOINSTANCE_MAX_LEVELS 10
-diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c
---- freewrl-1.22.10/src/lib/world_script/fieldGet.c	2010-10-13 23:45:26.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c	2011-07-04 20:21:21.000000000 +0400
-@@ -412,7 +412,7 @@
- 				/* create a new SFFloat object */
- 				
- 				fp = (float *)fp_in; 
--				newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp));
-+				newjsval = JS_NewJSVal(cx,(double)*fp);
- 				fp_in = offsetPointer_deref(float *,fp_in,elementlen);
- 
- 				/* put this object into the MF class */
-@@ -449,7 +449,7 @@
- 				/* create a new SFTime object */
- 				
- 				fp = (float *)fp_in; 
--				newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp));
-+				newjsval = JS_NewJSVal(cx,(double)*fp);
- 				fp_in = offsetPointer_deref(float *,fp_in,elementlen);
- 
- 				/* put this object into the MF class */
-diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c
---- freewrl-1.22.10/src/lib/world_script/fieldSet.c	2010-09-22 00:00:25.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c	2011-07-04 20:03:53.000000000 +0400
-@@ -748,7 +748,7 @@
- 
- 	#ifdef SETFIELDVERBOSE
- 	strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--       	strp = JS_GetStringBytes(strval);
-+	strp = JS_EncodeString(scriptContext, strval);
- 	printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp);
- 	#endif
- 
-@@ -813,7 +813,7 @@
- 		case FIELDTYPE_SFImage: {
- 			/* the string should be saved as an SFImage */
- 			strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        	strp = JS_GetStringBytes(strval);
-+	        	strp = JS_EncodeString(scriptContext, strval);
- 
- 			Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE);
- 			break;
-@@ -824,7 +824,7 @@
- 			uintptr_t *newptr;
- 
- 			strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        	strp = JS_GetStringBytes(strval);
-+	        	strp = JS_EncodeString(scriptContext, strval);
- 
- 			/* copy the string over, delete the old one, if need be */
- 			/* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n",
-@@ -844,7 +844,7 @@
- 				struct X3D_Node *mynode;
- 
- 				strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        		strp = JS_GetStringBytes(strval);
-+	        		strp = JS_EncodeString(scriptContext, strval);
- 				
- 				/* we will have at least one node here, in an ascii string */
- 				while ((*strp > '\0') && (*strp <= ' ')) strp ++;
-@@ -1227,7 +1227,7 @@
- 			JSString *_tmpStr;
- 
- 	                _tmpStr = JS_ValueToString(cx, mainElement);
--			strp = JS_GetStringBytes(_tmpStr);
-+			strp = JS_EncodeString(scriptContext, _tmpStr);
- 	                printf ("sub element %d is \"%s\" \n",i,strp);  
- 
- 			if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i);
-@@ -1329,7 +1329,7 @@
- 				JSString *strval;
- 	
- 	                        strval = JS_ValueToString(cx, mainElement);
--	                        strp = JS_GetStringBytes(strval);
-+	                        strp = JS_EncodeString(cx, strval);
- 	
- 				#ifdef SETFIELDVERBOSE
- 				printf ("getJSMultiNumType, got string %s\n",strp); 
-@@ -1441,7 +1441,7 @@
- 			return;
- 		}
- 		strval = JS_ValueToString(cx, _v);
--		valStr = JS_GetStringBytes(strval);
-+		valStr = JS_EncodeString(cx, strval);
- 
- 		/* printf ("new string %d is %s\n",i,valStr); */
- 
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c
---- freewrl-1.22.10/src/lib/world_script/jsUtils.c	2010-06-03 23:38:37.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c	2011-07-04 20:21:44.000000000 +0400
-@@ -134,7 +134,7 @@
- 			nf = OBJECT_TO_JSVAL(me);
- 
- 			#ifdef JSVRMLCLASSESVERBOSE
--			printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf)));
-+			printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf)));
- 			#endif
- 
- 			if (!setSFNodeField (cx, par, pf, &nf)) {
-@@ -197,7 +197,7 @@
-         		char *_id_c;
- 
-         		_idStr = JS_ValueToString(cx, *newval);
--        		_id_c = JS_GetStringBytes(_idStr);
-+        		_id_c = JS_EncodeString(cx, _idStr);
- 
- 			oldS = (struct Uni_String *) *((uintptr_t *)Data);
- 
-@@ -305,12 +305,12 @@
- 
- 		case FIELDTYPE_SFFloat:	{
- 			memcpy ((void *) &fl, Data, datalen);
--			*newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl));
-+			*newval = JS_NewJSVal(cx,(double)fl);
- 			break;
- 		}
- 		case FIELDTYPE_SFTime:	{
- 			memcpy ((void *) &dl, Data, datalen);
--			*newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl));
-+			*newval = JS_NewJSVal(cx,dl);
- 			break;
- 		}
- 		case FIELDTYPE_SFBool:
-@@ -824,7 +824,7 @@
- 	struct X3D_Node *node;
- 
- 	_idStr = JS_ValueToString(context, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(context, _idStr);
- 	
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj);
-@@ -912,7 +912,7 @@
- 
- 	/* get the id field... */
- 
--	_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id));
-+	_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id));
- 	
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp);
-@@ -1131,10 +1131,10 @@
- 	char *_id_c = "(no value in string)";
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	/* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */
- 	} else if (JSVAL_IS_DOUBLE(id)) {
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1192,7 +1192,7 @@
- 	/* get the id field... */
- 
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1211,7 +1211,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1229,7 +1229,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1247,7 +1247,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1265,7 +1265,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1283,7 +1283,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1301,7 +1301,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1319,7 +1319,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1337,7 +1337,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1355,7 +1355,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1373,7 +1373,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c
---- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c	2010-08-02 23:55:57.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c	2011-07-04 20:06:25.000000000 +0400
-@@ -336,7 +336,7 @@
- 			return JS_FALSE;
- 		}
- 		_str = JS_ValueToString(context, argv[0]);
--		_costr = JS_GetStringBytes(_str);
-+		_costr = JS_EncodeString(context, _str);
- 
- 		/* sanitize string, for the EAI_RW call (see EAI_RW code) */
- 		tptr = _costr;
-@@ -385,10 +385,10 @@
- 			return JS_FALSE;
- 		}
- 		_str[0] = JS_ValueToString(context, argv[0]);
--		_costr[0] = JS_GetStringBytes(_str[0]);
-+		_costr[0] = JS_EncodeString(context, _str[0]);
- 
- 		_str[1] = JS_ValueToString(context, argv[1]);
--		_costr[1] = JS_GetStringBytes(_str[1]);
-+		_costr[1] = JS_EncodeString(context, _str[1]);
- 
- 		/* we use the EAI code for this - so reformat this for the EAI format */
- 		{
-@@ -575,7 +575,7 @@
- 	/* third parameter should be a string */
- 	if (JSVAL_IS_STRING(argv[2])) {
- 		_str[1] = JSVAL_TO_STRING(argv[2]);
--		fieldStr = JS_GetStringBytes(_str[1]);
-+		fieldStr = JS_EncodeString(context, _str[1]);
- 		#ifdef JSVERBOSE
- 		printf ("field string is :%s:\n",fieldStr); 
- 		#endif
-@@ -590,7 +590,7 @@
- 
- 	/* get the URL listing as a string */
- 	_str[0] = JS_ValueToString(context, argv[0]);
--	_costr0 = JS_GetStringBytes(_str[0]);
-+	_costr0 = JS_EncodeString(context, _str[0]);
- 
- 
- 	#ifdef JSVERBOSE
-@@ -690,7 +690,7 @@
- 	for (count=0; count < argc; count++) {
- 		if (JSVAL_IS_STRING(argv[count])) {
- 			_str = JSVAL_TO_STRING(argv[count]);
--			_id_c = JS_GetStringBytes(_str);
-+			_id_c = JS_EncodeString(context, _str);
- 			#if defined(AQUA) || defined(_MSC_VER)
- 			BrowserPrintConsoleMessage(_id_c); /* statusbar hud */
- 			consMsgCount = 0; /* reset the "Maximum" count */
-@@ -850,7 +850,7 @@
- 
- 	/* parameter should be a string */
- 	if (JSVAL_IS_STRING(argv[0])) {
--		target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0]));
-+		target = JS_EncodeString(context,  JSVAL_TO_STRING(argv[0]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",target); 
- 		#endif
-@@ -930,7 +930,7 @@
- 
- 	/* parameters should be a string */
- 	if (JSVAL_IS_STRING(argv[0])) {
--		targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0]));
-+		targetDevice = JS_EncodeString(cx,  JSVAL_TO_STRING(argv[0]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",targetDevice); 
- 		#endif
-@@ -939,7 +939,7 @@
- 		return -1;
- 	}
- 	if (JSVAL_IS_STRING(argv[1])) {
--		targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1]));
-+		targetController = JS_EncodeString(cx,  JSVAL_TO_STRING(argv[1]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",targetController); 
- 		#endif
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c	2010-09-22 23:40:48.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c	2011-07-04 20:08:03.000000000 +0400
-@@ -935,7 +935,7 @@
-                 		        printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd);
-                         		return JS_FALSE;
-                 		}
--                		val = DOUBLE_TO_JSVAL(dp);
-+                		val = DOUBLE_TO_JSVAL(*dp);
- 
- 			}
- 		}
-@@ -1108,7 +1108,7 @@
- 
- 		printf ("HAVE STRING HERE!\n");
- 		_str = JS_ValueToString(cx, id);
--		asciiStr = JS_GetStringBytes(_str);
-+		asciiStr = JS_EncodeString(context, _str);
- 		printf ("we have as a parameter :%s:\n",asciiStr);
- 		#endif
- 
-@@ -1185,7 +1185,7 @@
- 			if (_tmpStr==NULL) {
- 				_tmp_valStr = "NULL";
- 			} else {
--				_tmp_valStr = JS_GetStringBytes(_tmpStr);
-+				_tmp_valStr = JS_EncodeString(cx, _tmpStr);
- 			}
- 		}
- 
-@@ -1281,7 +1281,7 @@
- 	#endif
- 
- 	str = JS_ValueToString(cx, id);
--	p = JS_GetStringBytes(str);
-+	p = JS_EncodeString(cx, str);
- 	#ifdef JSVRMLCLASSESVERBOSE
- 		printf("\tid string  %s\n ",p);
- 	#endif
-@@ -1368,12 +1368,12 @@
- 	char * _c;
- 		printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp);
- 		_str = JS_ValueToString(cx, id);
--		_c = JS_GetStringBytes(_str);
-+		_c = JS_EncodeString(cx, _str);
- 		printf ("id is %s\n",_c);
- 
- 		_sstr = JS_ValueToString(cx, *vp);
- 		printf ("looking up value for %d %x object %p\n",*vp,*vp,obj);
--			_cc = JS_GetStringBytes(_sstr);
-+			_cc = JS_EncodeString(cx, _sstr);
- 			printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type,
- 			   obj, _c, _cc);
- 		if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); }
-@@ -1397,7 +1397,7 @@
- 
- 			if (!JS_ValueToInt32(cx, *vp, &i)) {
- 				_sstr = JS_ValueToString(cx, *vp);
--				_cc = JS_GetStringBytes(_sstr);
-+				_cc = JS_EncodeString(cx, _sstr);
- 				printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type);
- 				return JS_FALSE;
- 			}
-@@ -1408,7 +1408,7 @@
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		printf ("doMFSetProperty - ensure that this is a DOUBLE ");
- 				_sstr = JS_ValueToString(cx, *vp);
--				_cc = JS_GetStringBytes(_sstr);
-+				_cc = JS_EncodeString(cx, _sstr);
- 				printf ("value is  %s \n",_cc);
- 		#endif
- 
-@@ -1420,7 +1420,7 @@
-                		        printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd);
-                        		return JS_FALSE;
-                		}
--               		*vp = DOUBLE_TO_JSVAL(dp);
-+               		*vp = DOUBLE_TO_JSVAL(*dp);
- 
- 		}
- 	}
-@@ -1511,7 +1511,7 @@
- 			nf = OBJECT_TO_JSVAL(me);
- 
- 			#ifdef JSVRMLCLASSESVERBOSE
--			printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf)));
-+			printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf)));
- 			#endif
- 
- 			if (!setSFNodeField (cx, par, pf, &nf)) {
-@@ -1535,7 +1535,7 @@
- 	unsigned int i, j = 0;
- 
- 	_str = JS_ValueToString(cx, *vp);
--	_buff = JS_GetStringBytes(_str);
-+	_buff = JS_EncodeString(cx, _str);
- 	_buff_len = strlen(_buff) + 1;
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
-@@ -1719,14 +1719,14 @@
- 	size_t len = 0;
- 
- 	_idStr = JS_ValueToString(context, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(context, _idStr);
- 
-         /* "register" this ECMA value for routing changed flag stuff */
-        	setInECMATable(context, _id_c);
- 
- 	if (JSVAL_IS_STRING(*vp)) {
- 		_vpStr = JS_ValueToString(context, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(context, _vpStr);
- 
- 		len = strlen(_vp_c);
- 
-@@ -1752,7 +1752,7 @@
- 	} else {
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		_vpStr = JS_ValueToString(context, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(cx, _vpStr);
- 		printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n",
- 			   obj, _id_c, _vp_c);
- 		#endif
-@@ -1770,9 +1770,9 @@
- 	JSString *_idStr, *_vpStr;
- 	char *_id_c, *_vp_c;
- 		_idStr = JS_ValueToString(cx, id);
--		_id_c = JS_GetStringBytes(_idStr);
-+		_id_c = JS_EncodeString(cx, _idStr);
- 		_vpStr = JS_ValueToString(cx, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(cx, _vpStr);
- 		printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n",
- 			   obj, _id_c, _vp_c);
- 	printf ("what is vp? \n");
-@@ -1803,7 +1803,7 @@
- 
- 	if (JSVAL_IS_STRING(id)) {
- 		_str = JSVAL_TO_STRING(id);
--		_id_c = JS_GetStringBytes(_str);
-+		_id_c = JS_EncodeString(cx, _str);
- 		if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) {
- 			printf( "JS_ConvertValue failed in setAssignProperty.\n");
- 			return JS_FALSE;
-@@ -1834,9 +1834,9 @@
-                 if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n");
-                 if (JSVAL_IS_INT(id)) printf ("id is an INT\n");
- 
--		printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id)));
--		printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal)));
--		printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal)));
-+		printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id)));
-+		printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal)));
-+		printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal)));
- 
- 		#endif
- 
-@@ -1859,7 +1859,7 @@
- 	} else {
- 		#ifdef JSVRMLCLASSESVERBOSE
- 			_str = JS_ValueToString(cx, id);
--			_id_c = JS_GetStringBytes(_str);
-+			_id_c = JS_EncodeString(cx, _str);
- 			printf("setAssignProperty: obj = %p, id = \"%s\"\n",
- 				   obj, _id_c);
- 		#endif
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h
---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h	2010-10-13 23:45:26.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h	2011-07-04 20:24:53.000000000 +0400
-@@ -30,6 +30,21 @@
- #ifndef __FREEWRL_JS_VRML_CLASSES_H__
- #define __FREEWRL_JS_VRML_CLASSES_H__
- 
-+static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d)
-+{
-+	jsval ret;
-+	JS_NewNumberValue(cx, d, &ret);
-+	return ret;
-+}
-+
-+static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d)
-+{
-+	static jsdouble ret;
-+	jsval rv;
-+	JS_NewNumberValue(cx, d, &rv);
-+	ret = JSVAL_TO_DOUBLE(rv);
-+	return &ret;
-+}
- 
- #ifndef UNUSED
- #define UNUSED(v) ((void) v)
-@@ -80,14 +95,14 @@
- 
- 
- #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \
--        zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime));  \
-+        zimbo = JS_NewJSVal(cx, TickTime);  \
-         if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) {  \
-                 printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \
-                 return possibleRetVal; \
-         }}
- 
- #define SET_JS_TICKTIME() { jsval zimbo; \
--        zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime));  \
-+        zimbo = JS_NewJSVal(cx, TickTime);  \
-         if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) {  \
-                 printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \
-                 return FALSE; \
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c	2010-09-22 23:40:48.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c	2011-07-04 20:08:44.000000000 +0400
-@@ -596,7 +596,7 @@
- 			return;
- 		}
- 
--		val = DOUBLE_TO_JSVAL(dp);
-+		val = DOUBLE_TO_JSVAL(*dp);
- 
- 		if (!JS_SetElement(cx, obj, (jsint) i, &val)) {
- 			printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i);
-@@ -1212,7 +1212,7 @@
- /*
-                 if (JSVAL_IS_STRING(id)==TRUE) {
-                 printf("        is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, id)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, id)));
-                 }
-                 if (JSVAL_IS_OBJECT(id)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1231,7 +1231,7 @@
- 		_index = JSVAL_TO_INT(id);
- 
- 		if (_index >= _length) {
--			*vp = DOUBLE_TO_JSVAL(&zerojsdouble);
-+			*vp = DOUBLE_TO_JSVAL(zerojsdouble);
- 			if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
- 				printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n");
- 				return JS_FALSE;
-@@ -1331,7 +1331,7 @@
- 	printf("MFStringAddProperty: vp = %p\n", obj);
-                 if (JSVAL_IS_STRING(*vp)==TRUE) {
- 		printf("	is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, *vp)));
-                 }
-                 if (JSVAL_IS_OBJECT(*vp)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1345,7 +1345,7 @@
- 		printf("MFStringAddProperty: id = %p\n", obj);
-                 if (JSVAL_IS_STRING(id)==TRUE) {
- 		printf("	is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, id)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, id)));
-                 }
-                 if (JSVAL_IS_OBJECT(id)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1494,7 +1494,7 @@
- 		if (JSVAL_IS_STRING(argv[i])==TRUE) {
-         	        printf (" Common String, is");
- 			_str = JS_ValueToString(cx, argv[i]);
--			printf (JS_GetStringBytes(_str));
-+			printf (JS_EncodeString(cx, _str));
- 			printf ("..");
- 		
- 	        }                                          
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c	2010-09-25 00:22:05.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c	2011-07-04 20:09:01.000000000 +0400
-@@ -161,7 +161,7 @@
- 			printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]);
- 			return JS_FALSE;
- 		}
--		_v = DOUBLE_TO_JSVAL(dp);
-+		_v = DOUBLE_TO_JSVAL(*dp);
-         	JS_SetElement(cx, result, (jsint)i, &_v); 
-         } 
- 
-@@ -336,7 +336,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -346,7 +346,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -356,7 +356,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -387,13 +387,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 
- 		}
-@@ -422,18 +422,18 @@
- 	*rval = OBJECT_TO_JSVAL(_arrayObj);
- 
- 	/* construct new double before conversion? */
--	_v = DOUBLE_TO_JSVAL(&hue);
-+	_v = DOUBLE_TO_JSVAL(hue);
- 	if (!JS_SetElement(cx, _arrayObj, 0, &_v)) {
- 		printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
- 	}
--	_v = DOUBLE_TO_JSVAL(&saturation);
-+	_v = DOUBLE_TO_JSVAL(saturation);
- 	if (!JS_SetElement(cx, _arrayObj, 1, &_v)) {
- 		printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
- 	}
- 
--	_v = DOUBLE_TO_JSVAL(&value);
-+	_v = DOUBLE_TO_JSVAL(value);
- 	if (!JS_SetElement(cx, _arrayObj, 2, &_v)) {
- 		printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
-@@ -601,7 +601,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -611,7 +611,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -621,7 +621,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -631,7 +631,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -662,16 +662,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 
- 		}
-@@ -983,7 +983,7 @@
- 	} else if (argc == 1) {
- 		/* is this a string, or a number indicating a node? */
- 		myStr = JS_ValueToString(cx, argv[0]);
--		cString = JS_GetStringBytes(myStr);
-+		cString = JS_EncodeString(cx, myStr);
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		printf ("SFNodeConstr, argc =1l string %s\n",cString);
- 		#endif
-@@ -1067,13 +1067,13 @@
-         		char *_id_c;
- 
- 			_idStr = JS_ValueToString(cx, argv[0]);
--			_id_c = JS_GetStringBytes(_idStr);
-+			_id_c = JS_EncodeString(cx, _idStr);
- 			/* printf ("first string :%s:\n",_id_c); */
- 
- 			cString = STRDUP(_id_c);
- 
- 			_idStr = JS_ValueToString(cx, argv[1]);
--			_id_c = JS_GetStringBytes(_idStr);
-+			_id_c = JS_EncodeString(cx, _idStr);
- 			/* printf ("second string :%s:\n",_id_c); */
- 
- 			if (sscanf (_id_c,"%p",&newHandle) != 1) {
-@@ -1190,7 +1190,7 @@
- 	jsval rval;
- 
-         _idStr = JS_ValueToString(cx, id);
--        _id_c = JS_GetStringBytes(_idStr);
-+        _id_c = JS_EncodeString(cx, _idStr);
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("start of SFNodeGetProperty... id is %s\n",_id_c);
-@@ -1264,10 +1264,10 @@
- 
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	_valStr = JS_ValueToString(cx, *vp);
--	_val_c = JS_GetStringBytes(_valStr);
-+	_val_c = JS_EncodeString(cx, _valStr);
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
- 		printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n",
-@@ -1904,7 +1904,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -1914,7 +1914,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -1924,7 +1924,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -1934,7 +1934,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -1969,16 +1969,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2051,7 +2051,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf",
- 							&(pars[0]), &(pars[1])) != 2) {
-@@ -2143,7 +2143,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec2f.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
-@@ -2332,7 +2332,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -2342,7 +2342,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -2373,13 +2373,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2458,7 +2458,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf %lf",
- 							&(pars[0]), &(pars[1]), &(pars[2])) != 3) {
-@@ -2580,7 +2580,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec3f.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	if (retSFVec3f){
-@@ -2792,9 +2792,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -2813,7 +2813,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -2823,7 +2823,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -2833,7 +2833,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -2869,13 +2869,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2949,7 +2949,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf %lf",
- 							&(pars[0]), &(pars[1]), &(pars[2])) != 3) {
-@@ -3071,7 +3071,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec3d.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	if (retSFVec3d){
-@@ -3282,9 +3282,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3303,7 +3303,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3313,7 +3313,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3323,7 +3323,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3359,13 +3359,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -3513,9 +3513,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3534,7 +3534,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3544,7 +3544,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3554,7 +3554,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -3564,7 +3564,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3600,16 +3600,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -3758,9 +3758,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3779,7 +3779,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3789,7 +3789,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3799,7 +3799,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -3809,7 +3809,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3845,16 +3845,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c
---- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c	2010-09-22 20:54:59.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c	2011-07-04 01:19:07.000000000 +0400
-@@ -54,7 +54,7 @@
- #include "X3DProtoScript.h"
- 
- #if HAVE_EXPAT_H
--# include <expat.h>
-+# include </usr/include/expat.h>
- #endif
- //#define X3DPARSERVERBOSE 1
- 
diff --git a/community-staging/fxdesktop/PKGBUILD b/community-staging/fxdesktop/PKGBUILD
deleted file mode 100644
index 8e691467c..000000000
--- a/community-staging/fxdesktop/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 62325 2012-01-19 08:58:33Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxdesktop
-pkgver=0.1.12
-pkgrel=5
-pkgdesc="Lightweight Desktop Environment"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/fxdesktop/"
-license=('GPL')
-depends=('fox>=1.6.0' )
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('9489e7369b5e052e0b6836a3b0670832')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64)
-  # Compile
-  ./gb --prefix=/usr
-  ./gb --package-root=$pkgdir/usr install
-}
diff --git a/community-staging/fxprocessview/PKGBUILD b/community-staging/fxprocessview/PKGBUILD
deleted file mode 100644
index e5c049e53..000000000
--- a/community-staging/fxprocessview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 62327 2012-01-19 08:59:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxprocessview
-pkgver=0.5.0
-pkgrel=4
-pkgdesc="Process Viewer"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('fox>=1.4.0')
-url="http://code.google.com/p/fxdesktop/"
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \
-	build-fix.patch)
-md5sums=('5d3cc8d7aec770997c281a743ddfda5a'
-	 '2d2c3d54dcd2404149955f12cccb21a5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  # Compile
-  patch -Np1 <../build-fix.patch
-  ./gb
-  # gb does not return valid error code
-  [ -f src/fxprocessview ]
-  # make sure destination exists
-  mkdir -p $pkgdir/usr/bin
-  # Install
-  ./gb install --package-root=$pkgdir/usr
-}
diff --git a/community-staging/fxprocessview/build-fix.patch b/community-staging/fxprocessview/build-fix.patch
deleted file mode 100644
index 7c883454c..000000000
--- a/community-staging/fxprocessview/build-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp
---- fxprocessview-0.5.0/src/processlist.cpp	2005-07-15 06:39:17.000000000 +0400
-+++ fxprocessview-0.5.0.my/src/processlist.cpp	2007-03-07 19:21:34.000000000 +0300
-@@ -696,7 +696,7 @@
- 
- long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){
-   if (userfilter.empty()){
--	userfilter=FXFile::getCurrentUserName();
-+	userfilter=FXSystem::currentUserName();
- 	}
-   else {
-  	userfilter="";
-@@ -942,12 +942,17 @@
- 
- 
- 
--  FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT);
-+  FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent);
-   task_total=num_processes;
-   for (FXint i=0;i<num_processes;i++){
- 
-     /// Check the Owner
--    owner = FXFile::owner("/proc/" + dirlist[i]);
-+    FXStat stat;
-+    FXStat::statFile("/proc/" + dirlist[i], stat);
-+    owner = FXSystem::userName(stat.user());
-+
-+//    owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i]));
-+
-     if (!userfilter.empty() && (owner!=userfilter)) continue;
- 
-     /// Read in Process Stat
-@@ -1027,7 +1032,7 @@
-       }
- 
-     filename = "/proc/" + dirlist[i] + "/cmdline";
--    if (FXFile::exists(filename)) {
-+    if (FXStat::exists(filename)) {
-       fp = fopen(filename.text(),"r");
-       if (fp) {
-         if (fgets(buffer,80,fp)!=NULL){
diff --git a/community-staging/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD
deleted file mode 100644
index 32892b79a..000000000
--- a/community-staging/gambas2/PKGBUILD
+++ /dev/null
@@ -1,950 +0,0 @@
-# $Id: PKGBUILD 62476 2012-01-20 08:43:11Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Toni Foerster <stonerl@skeps.de>
-
-pkgbase="gambas2"
-pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
-         'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-         'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-         'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-         'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
-         'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-         'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-         'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-         'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-         'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-         'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.1
-pkgrel=7
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
-         'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
-         'libxcursor' 'libsm')
-makedepends=('intltool' 'mysql' 'postgresql')
-license=('GPL2')
-options=('!emptydirs' '!makeflags')
-groups=('gambas2')
-replaces=('gambas2')
-conflicts=('gambas2')
-source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
-        'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
-	'poppler-0.18.patch'
-	'gambas2-script.install' 'gambas2-runtime.install')
-md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         'ac9703b390502ed3242c8d34485c9236'
-         'a551b4b216bbdb3489f3c264bf73ee66'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b')
-_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
-
-_buildgbcomp() {
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  install $1.gambas ${pkgdir}/usr/lib/gambas2/
-  install .component ${pkgdir}/usr/lib/gambas2/$1.component
-  chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component
-  install .info ${pkgdir}/usr/share/gambas2/info/$1.info
-  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info
-  install .list ${pkgdir}/usr/share/gambas2/info/$1.list
-  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list
-  if test -d control; then
-    install -d ${pkgdir}/usr/share/gambas2/control/$1
-    install control/*.png ${pkgdir}/usr/share/gambas2/control/$1
-    chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png
-  fi
-}
-
-build() {
-  cd "${srcdir}/$pkgbase-$pkgver"
-
-  ## workaround to allow package splitting
-  msg "Applying patches ..."
-  patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
-  # merged upstream
-  patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
-  patch -Np2 -i "${srcdir}/poppler-0.18.patch"
-  ./reconf-all
-  ##
-  
-  . /etc/profile.d/kde3.sh
-  . /etc/profile.d/qt3.sh
-
-  ./configure -C --disable-qte --prefix=/usr
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas2-meta() {
-  depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
-           'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-           'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-           'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
-           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-           'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-           'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-           'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-  pkgdesc="Gambas2 meta package"
-}
-
-package_gambas2-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Gambas2 runtime environment"
-  install=gambas2-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \
-    ${pkgdir}/usr/lib/gambas2
-  ln -s gbx2 ${pkgdir}/usr/bin/gbr2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
-    ${pkgdir}/usr/share/gambas2/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas2/icons
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \
-    ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png
-}
-
-package_gambas2-devel() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-ide() {
-  depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings'
-           'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel')
-  pkgdesc="Gambas2 Integrated Development Environment"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.dialog
-  _buildgbcomp gb.form.mdi
-  _buildgbcomp gb.settings
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
-  rm ${pkgdir}/usr/bin/gbx2
-  ##
-
-  install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin
-  install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin
-  ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \
-    ${pkgdir}/usr/share/applications/gambas2.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \
-    ${pkgdir}/usr/share/pixmaps/gambas2.png
-}
-
-package_gambas2-examples() {
-  depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-           'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-           'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
-           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-           'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-           'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-           'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-  pkgdesc="Gambas2 examples"
-#  arch=('any')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas2/{help,info}
-}
-
-package_gambas2-help() {
-  depends=()
-  pkgdesc="Gambas2 help files"
-#  arch=('any')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/help
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  #fix help
-  chown root:root -R ${pkgdir}/usr/share/gambas2/help/help
-}
-
-package_gambas2-script() {
-  depends=('gambas2-devel')
-  pkgdesc="Gambas2 scripter and server programs support"
-  install=gambas2-script.install
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  install -m755 gbs2.gambas ${pkgdir}/usr/bin
-
-  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2
-  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2  
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
-  rm ${pkgdir}/usr/bin/gbx2
-  ##
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/
-  ##
-}
-
-package_gambas2-gb-chart() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 chart component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.chart
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-compress() {
-  depends=('gambas2-runtime' 'bzip2' 'zlib')
-  pkgdesc="Gambas2 compression support component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-corba() {
-  depends=('gambas2-runtime' 'omniorb')
-  pkgdesc="Gambas2 corba component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-crypt() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 MD5/DES crypting component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-firebird() {
-  depends=('gambas2-gb-db' 'libfbclient')
-  pkgdesc="Gambas2 Firebird database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-form() {
-  depends=('gambas2-gb-db' 'gambas2-gb-form')
-  pkgdesc="Gambas2 database form component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.db.form
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-db-mysql() {
-  depends=('gambas2-gb-db' 'libmysqlclient')
-  pkgdesc="Gambas2 MySQL database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-odbc() {
-  depends=('gambas2-gb-db' 'unixodbc')
-  pkgdesc="Gambas2 ODBC database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-postgresql() {
-  depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1')
-  pkgdesc="Gambas2 PostgreSQL database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite2() {
-  depends=('gambas2-gb-db' 'sqlite2')
-  pkgdesc="Gambas2 Sqlite2 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite3() {
-  depends=('gambas2-gb-db' 'sqlite3')
-  pkgdesc="Gambas2 Sqlite3 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-desktop() {
-  depends=('gambas2-runtime' 'libsm' 'libxtst')
-  pkgdesc="Gambas2 desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form() {
-  depends=('gambas2-gb-gui')
-  pkgdesc="Gambas2 form component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form-dialog() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 form dialog component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.dialog
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form-mdi() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 form MDI component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.mdi
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk() {
-  depends=('gambas2-runtime' 'gtk2')
-  pkgdesc="Gambas2 graphical GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk-ext() {
-  depends=('gambas2-gb-gtk')
-  pkgdesc="Gambas2 graphical GTK+ toolkit extension component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk-svg() {
-  depends=('gambas2-gb-gtk' 'librsvg')
-  pkgdesc="Gambas2 graphical GTK+ toolkit svg component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gui() {
-  depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
-  pkgdesc="Gambas2 automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-image() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 image processing component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-info() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 info component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.info
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-net() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 networking component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-curl() {
-  depends=('gambas2-runtime' 'curl')
-  pkgdesc="Gambas2 advanced networking component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-smtp() {
-  depends=('gambas2-runtime' 'glib2')
-  pkgdesc="Gambas2 SMTP component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-opengl() {
-  depends=('gambas2-runtime' 'libgl' 'mesa')
-  pkgdesc="Gambas2 OpenGL component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-option() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 command-line options component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pcre() {
-  depends=('gambas2-runtime' 'pcre')
-  pkgdesc="Gambas2 PCRE component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pdf() {
-  depends=('gambas2-runtime' 'poppler-glib')
-  pkgdesc="Gambas2 PDF component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-qt() {
-  depends=('gambas2-runtime' 'qt3')
-  pkgdesc="Gambas2 graphical QT toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-ext() {
-  depends=('gambas2-gb-qt')
-  pkgdesc="Gambas2 graphical QT toolkit extension component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-opengl() {
-  depends=('gambas2-gb-qt' 'libgl')
-  pkgdesc="Gambas2 graphical QT toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-kde() {
-  depends=('gambas2-gb-qt' 'kdelibs3')
-  pkgdesc="Gambas2 KDE component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html*
-  rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html*
-}
-
-package_gambas2-gb-qt-kde-html() {
-  depends=('gambas2-gb-qt-kde')
-  pkgdesc="Gambas2 KHTML component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-report() {
-  depends=('gambas2-runtime' 'gambas2-gb-form')
-  pkgdesc="Gambas2 report component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.report
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-sdl() {
-  depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl')
-  pkgdesc="Gambas2 SDL component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-sdl-sound() {
-  depends=('gambas2-runtime' 'sdl_mixer')
-  pkgdesc="Gambas2 SDL sound component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-settings() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 settings management component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.settings
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-v4l() {
-  depends=('gambas2-runtime' 'libjpeg' 'libpng')
-  pkgdesc="Gambas2 V4L component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-vb() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 VB transitional component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-web() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 CGI component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.web
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml() {
-  depends=('gambas2-runtime' 'libxml2')
-  pkgdesc="Gambas2 xml component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-rpc() {
-  depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
-  pkgdesc="Gambas2 xml-rpc component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-xslt() {
-  depends=('gambas2-gb-xml' 'libxslt')
-  pkgdesc="Gambas2 xml-xslt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
diff --git a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch
deleted file mode 100644
index 0b6e68df3..000000000
--- a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:01:54	3864
-+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:26:41	3865
-@@ -1216,7 +1216,8 @@
-         GB.StoreVariant(&fantom, &buffer[i]);
-       }
-       else{
--        GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
-+	GB_VARIANT val = res->GetData(pos,i);
-+        GB.StoreVariant(&val , &buffer[i]);
-       }
-     }
-   }
-@@ -1874,6 +1875,8 @@
-   static char query[SQLMAXLEN];
-   int type;
-   std::string str1,str2;
-+  GB_VARIANT varval;
-+  char* charval;
-   snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
-   if (do_query(db, query, &res, "Unable to get the field from the table")){
-     delete res;
-@@ -1900,9 +1903,11 @@
-     str1=res->GetData(0,3).value.value._string;
-   if(str1!="")
-     str2=str1.assign(str1,8,str1.length()-8);
--  GB.FreeString(&res->GetData(0,3).value.value._string);
-+  charval = res->GetData(0,3).value.value._string;
-+  GB.FreeString(&charval);
-   res->SetData(0,3,str2);
--  GB.StoreVariant(&res->GetData(0,3), &info->def);
-+  varval = res->GetData(0,3);
-+  GB.StoreVariant(&varval, &info->def);
-   }
-   delete res;
-   return FALSE;
diff --git a/community-staging/gambas2/fix-gbi-gba-path.patch b/community-staging/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community-staging/gambas2/fix-gbi-gba-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- component.am	2010-03-15 20:54:43.000000000 +0100
-+++ ../component.am	2010-04-30 15:00:47.218700833 +0200
-@@ -6,17 +6,17 @@
- 	@if test -d $(COMPONENT); then \
- 		echo "Compiling the $(COMPONENT) project..."; \
- 		( \
--			$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
-+			$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
- 			cd $(COMPONENT); \
--			$(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
--			$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-+			$(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-+			$(GBFILES)/gba$(GAMBAS_VERSION); \
- 			rm -rf .gambas; \
- 			$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
- 		) \
- 	fi
- 	@echo
- 	@echo "Creating the information files for $(COMPONENT) component..."
--	@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
-+	@$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
- 	@echo
- 
- uninstall-hook:
diff --git a/community-staging/gambas2/gambas2-runtime.install b/community-staging/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-staging/gambas2/gambas2-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas2/gambas2-script.install b/community-staging/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community-staging/gambas2/gambas2-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/gambas2/gambas2.install b/community-staging/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-staging/gambas2/gambas2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas2/poppler-0.18.patch b/community-staging/gambas2/poppler-0.18.patch
deleted file mode 100644
index fbcc430bf..000000000
--- a/community-staging/gambas2/poppler-0.18.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gambas/trunk/gb.pdf/configure.ac	2010/07/14 01:50:18	3038
-+++ gambas/trunk/gb.pdf/configure.ac	2011/08/09 10:43:30	3997
-@@ -22,6 +22,8 @@
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
-   pkg-config --atleast-version=0.11.3 poppler
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-+  pkg-config --atleast-version=0.17.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
- fi
- 
- AC_OUTPUT( \
-
---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/06/03 00:51:09	3870
-+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/08/09 10:43:30	3997
-@@ -44,6 +44,7 @@
- #include <Outline.h>
- #include <Link.h>
- #include <Gfx.h>
-+#include <glib/poppler-features.h>
- 
- /*****************************************************************************
- 
-@@ -956,12 +957,17 @@
-  Bookmarks of a PDF page
- 
- ******************************************************************************/
-+
- void aux_fill_links(void *_object)
- {
-+	#if POPPLER_VERSION_0_17
-+	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
-+	#else
- 	Object obj;
- 	
- 	THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
- 	obj.free();
-+	#endif
- }
- 
- BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
deleted file mode 100644
index a3ea723e3..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1104 +0,0 @@
-# $Id: PKGBUILD 62492 2012-01-20 09:07:36Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
-         'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
-         'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
-         'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
-         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
-         'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
-         'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
-         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-         'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
-         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('f2c51e18b67ae6b21065ea0aed9b588e'
-         'b284be39d147ec799f1116a6abc068b4'
-         'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  ./reconf-all
-  ./configure --prefix=/usr -C
-
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Runtime environment"
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make DESTDIR="${pkgdir}" install
-  cd ../eval
-  make DESTDIR="${pkgdir}" install
-  cd ../draw
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../gb.component \
-    ${pkgdir}/usr/lib/gambas3
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  ln -s gbx3 ${pkgdir}/usr/bin/gbr3
-  gbc/gbi3 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 mime/* \
-    ${pkgdir}/usr/share/gambas3/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas3/icons
-  install -D -m644 mime/application-x-gambas3.png \
-    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
- 
-  cd gbc
-  make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
-  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
-           'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
-           'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
-  pkgdesc="Integrated Development Environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
-    ${pkgdir}/usr/share/applications/gambas3.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
-    ${pkgdir}/usr/share/pixmaps/gambas3.png
-
-  rm -r ${pkgdir}/usr/bin/gb*
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
-  depends=('gambas3-devel')
-  pkgdesc="Scripter and server programs support"
-  install=gambas3-script.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
-  ##
-
-  rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
-  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
-           'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
-           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
-           'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
-           'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-           'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-  pkgdesc="Applications examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  rm -r ${pkgdir}/usr/{bin,lib}
-  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
-  depends=('gambas3-runtime' 'cairo')
-  pkgdesc="Cairo component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-chart() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Chart component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
-  ##
-}
-
-package_gambas3-gb-compress() {
-  depends=('gambas3-runtime' 'bzip2' 'zlib')
-  pkgdesc="Compression support component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
-  ##
-}
-
-package_gambas3-gb-crypt() {
-  depends=('gambas3-runtime')
-  pkgdesc="MD5/DES crypting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-form() {
-  depends=('gambas3-gb-db' 'gambas3-gb-form')
-  pkgdesc="Database form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-mysql() {
-  depends=('gambas3-gb-db' 'libmysqlclient')
-  pkgdesc="MySQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-odbc() {
-  depends=('gambas3-gb-db' 'unixodbc')
-  pkgdesc="ODBC database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-postgresql() {
-  depends=('gambas3-gb-db' 'postgresql-libs')
-  pkgdesc="PostgreSQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite2() {
-  depends=('gambas3-gb-db' 'sqlite2')
-  pkgdesc="Sqlite2 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite3() {
-  depends=('gambas3-gb-db' 'sqlite3')
-  pkgdesc="Sqlite3 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-desktop() {
-  depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus-core')
-  pkgdesc="DBUS component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-eval-highlight() {
-  depends=('gambas3-runtime')
-  pkgdesc="Expression evaluator highlight component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  ##
-}
-
-package_gambas3-gb-form() {
-  depends=('gambas3-gb-gui')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-dialog() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form dialog component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-mdi() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form MDI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-stock() {
-  depends=('gambas3-runtime')
-  pkgdesc="Default stock icons component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
-  # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]*
-  ##
-}
-
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gui() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
-  pkgdesc="Automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
-  ##
-}
-
-package_gambas3-gb-image() {
-  depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-effect() {
-  depends=('gambas3-gb-image')
-  pkgdesc="Image effect component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-imlib() {
-  depends=('gambas3-gb-image' 'imlib2')
-  pkgdesc="Imlib component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-image-io() {
-  depends=('gambas3-gb-image' 'gdk-pixbuf2')
-  pkgdesc="Input/Output component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net() {
-  depends=('gambas3-runtime')
-  pkgdesc="Network component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-curl() {
-  depends=('gambas3-gb-net' 'curl')
-  pkgdesc="Curl component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-smtp() {
-  depends=('gambas3-runtime' 'glib2')
-  pkgdesc="SMTP component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl() {
-  depends=('gambas3-runtime' 'libgl' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glu() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GL Utility component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glsl() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GLSL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-option() {
-  depends=('gambas3-runtime')
-  pkgdesc="Getopt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
-  ##
-}
-
-package_gambas3-gb-pcre() {
-  depends=('gambas3-runtime' 'pcre')
-  pkgdesc="PCRE component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-pdf() {
-  depends=('gambas3-runtime' 'poppler')
-  pkgdesc="PDF component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
-  pkgdesc="Qt4 toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-ext() {
-  depends=('gambas3-gb-qt4')
-  pkgdesc="Qt4 toolkit extended component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-opengl() {
-  depends=('gambas3-gb-qt4' 'libgl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-webkit() {
-  depends=('gambas3-gb-qt4' 'qtwebkit')
-  pkgdesc="Qt4 toolkit webkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-report() {
-  depends=('gambas3-gb-form' 'gambas3-gb-image-io')
-  pkgdesc="Report component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-sdl() {
-  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-sdl-sound() {
-  depends=('gambas3-runtime' 'sdl_mixer')
-  pkgdesc="SDL sound component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-settings() {
-  depends=('gambas3-runtime')
-  pkgdesc="Setting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
-  ##
-}
-
-package_gambas3-gb-signal() {
-  depends=('gambas3-runtime')
-  pkgdesc="Signal component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
-  ##
-}
-
-package_gambas3-gb-v4l() {
-  depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
-  pkgdesc="Video4linux component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-vb() {
-  depends=('gambas3-runtime')
-  pkgdesc="VB transitional component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
-  ##
-}
-
-package_gambas3-gb-xml() {
-  depends=('gambas3-runtime' 'libxml2')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
-  ##
-}
-
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-web() {
-  depends=('gambas3-runtime')
-  pkgdesc="CGI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
-}
diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-staging/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-staging/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/gdal/PKGBUILD b/community-staging/gdal/PKGBUILD
deleted file mode 100644
index 67efe927c..000000000
--- a/community-staging/gdal/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 62931 2012-01-29 11:24:59Z svenstaro $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gdal
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="A translator library for raster geospatial data formats"
-arch=('i686' 'x86_64')
-url="http://www.gdal.org/"
-license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite3' 'libmysqlclient' 'postgresql-libs')
-makedepends=('perl' 'swig')
-optdepends=('postgresql: postgresql database support'
-            'mysql: mysql database support'
-            'perl:  perl binding support'
-            'swig:  perl binding support')
-options=('!libtool')
-changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        gdal-1.5.1-python-install.patch)
-md5sums=('1853f3d8eb5232ae030abe007840cade'
-         '81afc1c26d29cee84aadb6924fe33861')
-
-build() {
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  # bug 23654
-  export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
-
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch
-
-# python2 fixes
-  sed -i 's_python python1.5_python2 python python1.5_' configure
-  for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
-      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-
-  ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
-              --with-geotiff --with-mysql --with-python --without-libtool --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png
-
-# workaround for bug #13646
-  sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
-  sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-  install -d ${pkgdir}/usr/lib/python2.7/site-packages/
-
-  make
-}
-
-package () {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-
-# install license
-  install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-#FS15477 clean up junks
-  rm -f ${pkgdir}/usr/bin/*.dox
-}
diff --git a/community-staging/gdal/gdal-1.5.1-python-install.patch b/community-staging/gdal/gdal-1.5.1-python-install.patch
deleted file mode 100644
index 8ec414d37..000000000
--- a/community-staging/gdal/gdal-1.5.1-python-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- swig/python/GNUmakefile.orig	2010-04-24 01:22:07.000000000 +0200
-+++ swig/python/GNUmakefile	2010-05-05 19:14:58.000000000 +0200
-@@ -72,5 +72,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
diff --git a/community-staging/gdal/gdal.changelog b/community-staging/gdal/gdal.changelog
deleted file mode 100644
index c31121e1d..000000000
--- a/community-staging/gdal/gdal.changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.7.2
diff --git a/community-staging/gdk-pixbuf/PKGBUILD b/community-staging/gdk-pixbuf/PKGBUILD
deleted file mode 100644
index 8c9a1bced..000000000
--- a/community-staging/gdk-pixbuf/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62652 2012-01-23 09:38:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=gdk-pixbuf
-pkgver=0.22.0
-pkgrel=9
-pkgdesc="Image loading and manipulation library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL' 'LGPL')
-depends=('gtk' 'libtiff' 'libpng')
-makedepends=('libxt')
-options=('!libtool')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.24/${pkgname}-${pkgver}.tar.bz2
-	gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
-	gdk-pixbuf-0.22.0-bmp_secure.patch
-	gdk-pixbuf-0.22.0-loaders.patch
-	gdk-pixbuf-0.22.0.patch
-	libpng15.patch)
-md5sums=('05fcb68ceaa338614ab650c775efc2f2'
-         'd1fb93f1ae994875158a7e0c108c36f8'
-         '5f59d5772b1482d885a180dbc581cf84'
-         '3cf31ae0509747f72ac27a9fd96109c2'
-         'e0f5f301ce958b7cea0be631ed7b8e56'
-         '16db4dc83d507ebcf15d1beb753a77bc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  export SED=/bin/sed
-  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
-  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch
-  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch
-  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch
-  patch -Np1 -i ${srcdir}/libpng15.patch
-  libtoolize --force --copy --automake
-  autoreconf --force --install
-  ./configure --prefix=/usr --disable-gtk-doc
-  make
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/share/gnome
-}
diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
deleted file mode 100644
index ffb4378aa..000000000
--- a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2002-09-27 23:12:40.000000000 +0200
-+++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c	2005-03-30 01:33:06.000000000 +0200
-@@ -31,8 +31,6 @@
- #include "gdk-pixbuf-private.h"
- #include "gdk-pixbuf-io.h"
- 
--
--
- #if 0
- /* If these structures were unpacked, they would define the two headers of the
-  * BMP file.  After them comes the palette, and then the image data.
-@@ -206,7 +204,7 @@
- 
- 	if (State == NULL)
- 		return NULL;
--
-+ 	
- 	while (feof(f) == 0) {
- 		length = fread(membuf, 1, sizeof (membuf), f);
- 		if (length > 0)
-@@ -245,11 +243,26 @@
- static gboolean
- grow_buffer (struct bmp_progressive_state *State)
- {
--  guchar *tmp = realloc (State->buff, State->BufferSize);
-+  guchar *tmp;
-+
-+  if (State->BufferSize == 0) {
-+#if 0
-+    g_set_error (error,
-+		 GDK_PIXBUF_ERROR,
-+		 GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+		 _("BMP image has bogus header data"));
-+#endif
-+    State->read_state = READ_STATE_ERROR;
-+    return FALSE;
-+  }
-+
-+  tmp = realloc (State->buff, State->BufferSize);
-+
-   if (!tmp) {
-     State->read_state = READ_STATE_ERROR;
-     return FALSE;
-   }
-+
-   State->buff = tmp;
-   return TRUE;
- }
diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch
deleted file mode 100644
index 29471f147..000000000
--- a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: io-bmp.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
-retrieving revision 1.41
-diff -u -p -r1.41 io-bmp.c
---- gdk-pixbuf/io-bmp.c	13 Aug 2004 02:26:57 -0000	1.41
-+++ gdk-pixbuf/io-bmp.c	20 Aug 2004 00:18:14 -0000
-@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat
- 	guchar c;
- 	gint idx;
- 
--	if (context->compr.y >= context->Header.height)
-+	if (context->compr.y >= context->Header.height) {
-+		context->BufferDone = 0;
- 		return TRUE;
-+	}
- 
- 	y = context->compr.y;
- 
diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch
deleted file mode 100644
index 068653808..000000000
--- a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c	2002-09-27 17:19:15.000000000 -0500
-+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c	2005-10-27 11:28:23.000000000 -0500
-@@ -330,6 +330,9 @@
- 
- 	State->HeaderSize+=I;
- 
-+ 	if (State->HeaderSize < 0)
-+ 		return FALSE;
-+ 
-  	if (State->HeaderSize>State->BytesInHeaderBuf) {
- 		guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
- 		if (!tmp)
-diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c	2001-03-01 15:16:28.000000000 -0500
-+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c	2005-10-27 11:29:14.000000000 -0500
-@@ -243,8 +243,8 @@
- 			break;
- 		else {
- 			if (numnames > 0) {
--				space -= 1;
--				strcat (color, " ");
-+				strncat (color, " ", space);
-+				space -= MIN (space, 1);
- 			}
- 
- 			strncat (color, temp, space);
-@@ -281,7 +281,8 @@
- 		/* Fall through to the xpm_read_string. */
- 
- 	case op_body:
--		xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
-+		if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
-+			return NULL;
- 		return h->buffer;
- 
- 	default:
-@@ -317,13 +318,6 @@
- 	return NULL;
- }
- 
--/* Destroy notification function for the pixbuf */
--static void
--free_buffer (guchar *pixels, gpointer data)
--{
--	free (pixels);
--}
--
- static gboolean
- xpm_color_parse (const char *spec, XColor *color)
- {
-@@ -342,7 +336,8 @@
- 	gchar pixel_str[32];
- 	GHashTable *color_hash;
- 	_XPMColor *colors, *color, *fallbackcolor;
--	guchar *pixels, *pixtmp;
-+	guchar *pixtmp;
-+	GdkPixbuf* pixbuf;
- 
- 	fallbackcolor = NULL;
- 
-@@ -352,16 +347,33 @@
- 		return NULL;
- 	}
- 	sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
--	if (cpp >= 32) {
--		g_warning ("XPM has more than 31 chars per pixel.");
-+	if (cpp <= 0 || cpp >= 32) {
-+		g_warning ("XPM has invalid number of chars per pixel.");
- 		return NULL;
- 	}
-+	if (n_col <= 0 ||
-+	    n_col >= G_MAXINT / (cpp + 1) ||
-+	    n_col >= G_MAXINT / sizeof (_XPMColor)) {
-+		g_warning ("XPM file has invalid number of colors");
-+  		return NULL;
-+  	}
- 
- 	/* The hash is used for fast lookups of color from chars */
- 	color_hash = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	name_buf = g_new (gchar, n_col * (cpp + 1));
--	colors = g_new (_XPMColor, n_col);
-+ 	name_buf = g_new (gchar, n_col * (cpp + 1));
-+ 	if (!name_buf) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		return NULL;
-+ 	}
-+ 	colors = g_new (_XPMColor, n_col);
-+ 	if (!colors) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		g_free (name_buf);
-+ 		return NULL;
-+ 	}
- 
- 	for (cnt = 0; cnt < n_col; cnt++) {
- 		gchar *color_name;
-@@ -397,12 +409,8 @@
- 			fallbackcolor = color;
- 	}
- 
--	if (is_trans)
--		pixels = malloc (w * h * 4);
--	else
--		pixels = malloc (w * h * 3);
--
--	if (!pixels) {
-+	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h);
-+	if (!pixbuf) {
- 		g_hash_table_destroy (color_hash);
- 		g_free (colors);
- 		g_free (name_buf);
-@@ -410,7 +418,7 @@
- 	}
- 
- 	wbytes = w * cpp;
--	pixtmp = pixels;
-+	pixtmp = pixbuf->pixels;
- 
- 	for (ycnt = 0; ycnt < h; ycnt++) {
- 		buffer = (*get_buf) (op_body, handle);
-@@ -443,9 +451,7 @@
- 	g_free (colors);
- 	g_free (name_buf);
- 
--	return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8,
--					 w, h, is_trans ? (w * 4) : (w * 3),
--					 free_buffer, NULL);
-+	return pixbuf;
- }
- 
- /* Shared library entry point for file loading */
diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch
deleted file mode 100644
index 8e0f55680..000000000
--- a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -21,6 +21,7 @@
- AC_PROG_CC
- AC_ISC_POSIX
- AM_PROG_CC_STDC
-+AM_PROG_AS
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-@@ -147,18 +148,18 @@
- dnl Test for libtiff
-   if test -z "$LIBTIFF"; then
-     AC_CHECK_LIB(tiff, TIFFReadScanline,
--      AC_CHECK_HEADER(tiffio.h,
-+      [AC_CHECK_HEADER(tiffio.h,
-         TIFF='tiff'; LIBTIFF='-ltiff',
--        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--      AC_CHECK_LIB(tiff, TIFFWriteScanline,
--        AC_CHECK_HEADER(tiffio.h,
-+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+      [AC_CHECK_LIB(tiff, TIFFWriteScanline,
-+        [AC_CHECK_HEADER(tiffio.h,
-           TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
--          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--        AC_CHECK_LIB(tiff34, TIFFFlushData,
--          AC_CHECK_HEADER(tiffio.h,
-+          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+        [AC_CHECK_LIB(tiff34, TIFFFlushData,
-+          [AC_CHECK_HEADER(tiffio.h,
-             TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
--            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
-+            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
-   fi
- 
- dnl Test for libjpeg
-@@ -191,9 +192,9 @@
- dnl Test for libpng
-   if test -z "$LIBPNG"; then
-     AC_CHECK_LIB(png, png_read_info,
--      AC_CHECK_HEADER(png.h,
-+      [AC_CHECK_HEADER(png.h,
-         png_ok=yes,
--        png_ok=no),
-+        png_ok=no)],
-       AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
-     if test "$png_ok" = yes; then
-       AC_MSG_CHECKING([for png_structp in png.h])
---- doc/Makefile.am
-+++ doc/Makefile.am
-@@ -156,7 +156,7 @@
- 	  done; \
- 	fi)
- #	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--#	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+#	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR);
- 
- #
- # Require gtk-doc when making dist
---- gdk-pixbuf.m4
-+++ gdk-pixbuf.m4
-@@ -9,7 +9,7 @@
- dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
- dnl
--AC_DEFUN(AM_PATH_GDK_PIXBUF,
-+AC_DEFUN([AM_PATH_GDK_PIXBUF],
- [dnl 
- dnl Get the cflags and libraries from the gdk-pixbuf-config script
- dnl
---- gdk-pixbuf/Makefile.am
-+++ gdk-pixbuf/Makefile.am
-@@ -18,7 +18,7 @@
- 
- libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
- 
--libexecdir = $(libdir)/gdk-pixbuf/loaders
-+loaderdir = $(libdir)/gdk-pixbuf/loaders
- 
- #
- # The PNG plugin.
-@@ -118,7 +118,7 @@
- 
- if BUILD_DYNAMIC_MODULES
- 
--libexec_LTLIBRARIES = 	\
-+loader_LTLIBRARIES = 	\
- 	$(PNG_LIB)	\
- 	$(JPEG_LIB)	\
- 	$(GIF_LIB)	\
-@@ -134,7 +134,7 @@
- extra_sources = 
- 
- else
--libexec_LTLIBRARIES = 
-+loader_LTLIBRARIES = 
- 
- extra_sources = $(libpixbufloader_png_la_SOURCES) 	\
- 		$(libpixbufloader_jpeg_la_SOURCES) 	\
-@@ -159,7 +159,7 @@
- 	-I$(top_builddir)/gdk-pixbuf \
- 	$(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
- 
--AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
-+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
- 
- LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
-@@ -211,7 +211,7 @@
- 	gdk-pixbuf-parse-color.c	\
- 	$(extra_sources)
- 
--libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
-+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS)
- libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
- 
- 
---- gdk-pixbuf/io-bmp.c
-+++ gdk-pixbuf/io-bmp.c
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <stdlib.h>
- #include "gdk-pixbuf-private.h"
- #include "gdk-pixbuf-io.h"
- 
diff --git a/community-staging/gdk-pixbuf/libpng15.patch b/community-staging/gdk-pixbuf/libpng15.patch
deleted file mode 100644
index e667288f8..000000000
--- a/community-staging/gdk-pixbuf/libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c	2001-01-24 23:59:23.000000000 +0300
-+++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c	2012-01-23 13:33:08.000000000 +0400
-@@ -175,7 +175,7 @@
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- 		return NULL;
- 	}
-@@ -311,7 +311,7 @@
-                 return NULL;
-         }
- 
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -366,7 +366,7 @@
-         lc->max_row_seen_in_chunk = -1;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		return FALSE;
- 	} else {
- 		png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
diff --git a/community-staging/geda-gaf/ChangeLog b/community-staging/geda-gaf/ChangeLog
deleted file mode 100644
index c8b902cc5..000000000
--- a/community-staging/geda-gaf/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-2012-01-19 Kyle Keen <keenerd@gmail.com>
-	* 1.6.2-2
-	- libpng15 rebuild
-
-2010-12-26 Stefan Husmann <stefan-husmann@t-online.de>
-	* 1.6.1-2
-	- adopted, moved to [community]
-	- added some optional dependencies
-	- added some sed-commands for python2 compatibility
-
-2010-02-14 Jared Casper <jaredcasper@gmail.com>
-	* 1.6.1-1
-	- Version bump
-
-2009-10-10 Jared Casper <jaredcasper@gmail.com>
-	* 1.6.0-2
-	- Fixed a bug causing icon problems
-
-2009-10-05 Jared Casper <jaredcasper@gmail.com>
-	* 1.6.0-1
-	- Merged with geda-libs and renamed to geda-gaf to match up with
-	the release tarball name
-
-2009-05-03 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.3-2
-	- Added gettext dep (noted by sergej)
-	- Added '|| return 1's to configure and make commands
-	- A bit of other random cleanup of deps
-
-2009-01-03 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.3-1
-	- Version bump
-	- Fix dependencies (s/=>/>=/)
-
-2008-12-20 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.2-1
-	- Version bump
-	- Update from comments
-
-2008-09-28 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.1-1
-	- Version bump
-	- Added icon cache update
-	- Added icon cache and desktop update to post_update
-
-2008-05-07 Jared Casper <jaredcasper@gmail.com>
-
-	* 1.4.0-1
-	- adopted by Jared Casper
-	- Update PKGBUILD to current standards and latest version (1.4.0)
-	- add configure options and install script to handle desktop issues
-	- added ChangeLog
-
diff --git a/community-staging/geda-gaf/PKGBUILD b/community-staging/geda-gaf/PKGBUILD
deleted file mode 100644
index b3e6278b9..000000000
--- a/community-staging/geda-gaf/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Jared Casper <jaredcasper@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=geda-gaf
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
-arch=('i686' 'x86_64')
-url="http://www.gpleda.org"
-license=('GPL')
-depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'perlxml' 'flex' 'gawk')
-optdepends=('python2: for two of the commands (garchive, tragesym)'
-  'gawk: for sw2asc')
-replaces=('geda-suite' 'geda-libs')
-install=geda-gaf.install
-source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('35ae86aebc174ec1fc03863fde4c843c')
-
-build ()
-{
-  cd "$srcdir/$pkgname-$pkgver/"
-  ./configure --prefix=/usr --disable-update-xdg-database 
-  make 
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  make DESTDIR="$pkgdir/" install 
-  sed -i 's+/usr/bin/env python+/usr/bin/env python2+' \
-    "$pkgdir/usr/bin/garchive"
-  sed -i 's+/usr/bin/python+/usr/bin/python2+' \
-    "$pkgdir/usr/bin/tragesym"
-  sed -i 's+/usr/bin/python+/usr/bin/python2+' \
-    "$pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom"
-}
-
diff --git a/community-staging/geda-gaf/geda-gaf.install b/community-staging/geda-gaf/geda-gaf.install
deleted file mode 100644
index ad5e587cc..000000000
--- a/community-staging/geda-gaf/geda-gaf.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-   echo Updating icon cache...
-   /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-fi
-if [ -x /usr/bin/update-desktop-database ]; then
-   echo Updating desktop database..
-   /usr/bin/update-desktop-database /usr/share/applications
-fi
-update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
\ No newline at end of file
diff --git a/community-staging/gimp-plugin-mathmap/PKGBUILD b/community-staging/gimp-plugin-mathmap/PKGBUILD
deleted file mode 100644
index 60ec94ec0..000000000
--- a/community-staging/gimp-plugin-mathmap/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62824 2012-01-27 12:07:45Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Serge Gielkens <gielkens.serge@mumeli.org>
-pkgname=gimp-plugin-mathmap
-pkgver=1.3.5
-pkgrel=2
-pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae"
-arch=('i686' 'x86_64')
-url="http://www.complang.tuwien.ac.at/schani/mathmap/"
-license=('GPL')
-depends=('gimp' 'gsl' 'gtksourceview2' 'fftw' 'giflib')
-makedepends=('doxygen' 'unzip')
-provides=('gimp-mathmap')
-replaces=('gimp-mathmap')
-source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \
-        fix_libnoise_build.patch libpng15.patch)
-md5sums=('6ff66d070ea410dee1a27283d05b8beb'
-         'eca40de0ba0e6b8d34b7d1f904bc3d18'
-         '9780d6354b7380b772c4616253ecee54')
-
-build() {
-  cd "$srcdir/mathmap-$pkgver"
-
-  # fix problem with building libnoise
-  patch -Np1 < "$srcdir"/fix_libnoise_build.patch
-  # fix for libpng 1.5
-  patch -Np1 < "$srcdir"/libpng15.patch
-
-  make
-}
-
-package() {
-  cd "$srcdir/mathmap-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch b/community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch
deleted file mode 100644
index fc81ba0d8..000000000
--- a/community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup mathmap-1.3.5/Makefile mathmap-1.3.5-fix//Makefile
---- mathmap-1.3.5/Makefile	2009-08-23 13:56:14.000000000 +0200
-+++ mathmap-1.3.5-fix//Makefile	2010-11-11 16:48:13.308941852 +0100
-@@ -178,7 +178,7 @@ backends/lazy_creator.o : backends/lazy_
- 	$(CXX) $(MATHMAP_CXXFLAGS) $(FORMATDEFS) -o $@ -c backends/lazy_creator.cpp
- 
- builtins/libnoise.o : builtins/libnoise.cpp builtins/libnoise.h
--	$(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -o $@ -c builtins/libnoise.cpp
-+	$(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -Ilibnoise/noise/src -o $@ -c builtins/libnoise.cpp
- 
- new_builtins.c opdefs.h opfuncs.h compiler_types.h llvm-ops.h : builtins.lisp ops.lisp
- 	clisp builtins.lisp
diff --git a/community-staging/gimp-plugin-mathmap/libpng15.patch b/community-staging/gimp-plugin-mathmap/libpng15.patch
deleted file mode 100644
index 3cf95387c..000000000
--- a/community-staging/gimp-plugin-mathmap/libpng15.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -rup mathmap-1.3.5/rwimg/rwpng.c mathmap-1.3.5.new/rwimg/rwpng.c
---- mathmap-1.3.5/rwimg/rwpng.c	2009-08-23 13:56:14.000000000 +0200
-+++ mathmap-1.3.5.new/rwimg/rwpng.c	2012-01-27 13:02:29.708023734 +0100
-@@ -58,34 +58,34 @@ open_png_file_reading (const char *filen
-     data->end_info = png_create_info_struct(data->png_ptr);
-     assert(data->end_info != 0);
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     png_init_io(data->png_ptr, data->file);
- 
-     png_read_info(data->png_ptr, data->info_ptr);
- 
--    *width = data->info_ptr->width;
--    *height = data->info_ptr->height;
-+    *width = png_get_image_width(data->png_ptr, data->info_ptr);
-+    *height = png_get_image_height(data->png_ptr, data->info_ptr);
- 
--    if (data->info_ptr->bit_depth != 8 && data->info_ptr->bit_depth != 16)
-+    if (png_get_bit_depth(data->png_ptr, data->info_ptr) != 8 && png_get_bit_depth(data->png_ptr, data->info_ptr) != 16)
-     {
- 	fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n");
- 	/* FIXME: free stuff */
- 	return 0;
-     }
- 
--    if (data->info_ptr->color_type != PNG_COLOR_TYPE_RGB
--	&& data->info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA
--	&& data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY
--	&& data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB
-+	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA
-+	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY
-+	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
- 	fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n");
- 	/* FIXME: free stuff */
- 	return 0;
-     }
- 
--    if (data->info_ptr->interlace_type != PNG_INTERLACE_NONE)
-+    if (png_get_interlace_type(data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE)
-     {
- 	fprintf(stderr, "Interlaced PNG files are not supported.\n");
- 	/* FIXME: free stuff */
-@@ -105,24 +105,24 @@ png_read_lines (void *_data, unsigned ch
-     int bps, spp;
-     unsigned char *row;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
--    if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+    if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY)
- 	spp = 1;
--    else if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
- 	spp = 2;
--    else if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+    else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
- 	spp = 3;
-     else
- 	spp = 4;
- 
--    if (data->info_ptr->bit_depth == 16)
-+    if (png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
- 	bps = 2;
-     else
- 	bps = 1;
- 
--    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
-+    row = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * spp * bps);
- 
-     for (i = 0; i < num_lines; ++i)
-     {
-@@ -131,13 +131,13 @@ png_read_lines (void *_data, unsigned ch
- 	png_read_row(data->png_ptr, (png_bytep)row, 0);
- 
- 	if (spp <= 2)
--	    for (j = 0; j < data->info_ptr->width; ++j)
-+	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
- 		for (channel = 0; channel < 3; ++channel)
--		    lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps];
-+		    lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] = row[j * spp * bps];
- 	else
--	    for (j = 0; j < data->info_ptr->width; ++j)
-+	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
- 		for (channel = 0; channel < 3; ++channel)
--		    lines[i * data->info_ptr->width * 3 + j * 3 + channel]
-+		    lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel]
- 			= row[j * spp * bps + channel * bps];
-     }
- 
-@@ -151,7 +151,7 @@ png_free_reader_data (void *_data)
- {
-     png_data_t *data = (png_data_t*)_data;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     if (data->have_read)
-@@ -180,7 +180,7 @@ open_png_file_writing (const char *filen
-     data->info_ptr = png_create_info_struct(data->png_ptr);
-     assert(data->info_ptr != 0);
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     if (pixel_stride == 4)
-@@ -188,18 +188,9 @@ open_png_file_writing (const char *filen
- 
-     png_init_io(data->png_ptr, data->file);
- 
--    data->info_ptr->width = width;
--    data->info_ptr->height = height;
--    data->info_ptr->valid = 0;
--    data->info_ptr->rowbytes = width * 3;
--    data->info_ptr->palette = 0;
--    data->info_ptr->num_palette = 0;
--    data->info_ptr->num_trans = 0;
--    data->info_ptr->bit_depth = 8;
--    data->info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--    data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
--    data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
--    data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+    png_set_IHDR(data->png_ptr, data->info_ptr, width, height,
-+    8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-+    PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- 
-     png_write_info(data->png_ptr, data->info_ptr);
- 
-@@ -216,12 +207,12 @@ png_write_lines (void *_data, unsigned c
-     unsigned char *packed_line;
-     int i;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     if (data->pixel_stride != 3)
-     {
--	packed_line = (unsigned char*)malloc(data->info_ptr->width * 3);
-+	packed_line = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * 3);
- 	assert(packed_line != 0);
-     }
-     else
-@@ -235,7 +226,7 @@ png_write_lines (void *_data, unsigned c
- 	{
- 	    int j;
- 
--	    for (j = 0; j < data->info_ptr->width; ++j)
-+	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
- 	    {
- 		packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0];
- 		packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1];
-@@ -257,7 +248,7 @@ png_free_writer_data (void *_data)
- {
-     png_data_t *data = (png_data_t*)_data;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     png_write_end(data->png_ptr, data->info_ptr);
-Only in mathmap-1.3.5.new/rwimg: rwpng.c.orig
diff --git a/community-staging/gimp-plugin-wavelet-decompose/PKGBUILD b/community-staging/gimp-plugin-wavelet-decompose/PKGBUILD
deleted file mode 100644
index b91271e0b..000000000
--- a/community-staging/gimp-plugin-wavelet-decompose/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 62511 2012-01-20 09:51:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Denis Kvist <denvist@ya.ru>
-
-pkgname=gimp-plugin-wavelet-decompose
-pkgver=0.1.2
-pkgrel=2
-pkgdesc="Wavelet decompose plugin for Gimp"
-arch=('i686' 'x86_64')
-url="http://registry.gimp.org/node/11742"
-license=('GPL')
-depends=('gimp')
-source=(http://registry.gimp.org/files/wavelet-decompose-$pkgver.tar.gz \
-	po_install.diff)
-md5sums=('e0cb8670a1c5506d08f57f2300caac24'
-         '4de9e41a535f200c2502f0dd8458c43e')
-
-build() {
-  cd "$srcdir/wavelet-decompose-$pkgver"
-  patch -Np1 < ../po_install.diff
-  make
-  install -Dvm755 src/wavelet-decompose \
-	"$pkgdir"/usr/lib/gimp/2.0/plug-ins/wavelet-decompose
-  cd po
-  make LOCALEDIR="$pkgdir"/usr/share/locale install
-}
diff --git a/community-staging/gimp-plugin-wavelet-decompose/po_install.diff b/community-staging/gimp-plugin-wavelet-decompose/po_install.diff
deleted file mode 100644
index 4b6d1a9fe..000000000
--- a/community-staging/gimp-plugin-wavelet-decompose/po_install.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -c -r wavelet-denoise-0.3/po/Makefile wavelet-denoise-0.3-new/po/Makefile
-*** wavelet-denoise-0.3/po/Makefile	2008-12-14 12:19:22.000000000 +0100
---- wavelet-denoise-0.3-new/po/Makefile	2008-12-20 14:57:51.000000000 +0100
-***************
-*** 24,30 ****
-  
-  install: $(LANGUAGES)
-  	for L in $(LANGUAGES); \
-! 	do install -v -m 0644 $$L.mo "$(LOCALEDIR)/$$L/LC_MESSAGES/gimp20-$(PLUGIN)-plug-in.mo"; \
-  done
-  
-  uninstall: $(LANGUAGES)
---- 24,31 ----
-  
-  install: $(LANGUAGES)
-  	for L in $(LANGUAGES); \
-! 	do mkdir -p "$(LOCALEDIR)/$$L/LC_MESSAGES"; \
-! 	install -v -m 0644 $$L.mo "$(LOCALEDIR)/$$L/LC_MESSAGES/gimp20-$(PLUGIN)-plug-in.mo"; \
-  done
-  
-  uninstall: $(LANGUAGES)
diff --git a/community-staging/gliv/PKGBUILD b/community-staging/gliv/PKGBUILD
deleted file mode 100644
index 157adabfb..000000000
--- a/community-staging/gliv/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com>
-
-pkgname=gliv
-pkgver=1.9.7
-pkgrel=2
-pkgdesc="OpenGL image viewer"
-arch=('i686' 'x86_64')
-url="http://guichaz.free.fr/gliv/"
-license=('GPL')
-depends=('gtkglext')
-changelog=$pkgname.changelog
-source=(http://guichaz.free.fr/gliv/files/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5f0fafaf41651da8882e88b3df062d02')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  sed -i 's:pixmaps |:pixmaps $(datadir)/applications |:;s:vendor=gnome:vendor=gnome --dir=$(datadir)/applications:' Makefile
-  make
-} 
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/gliv/gliv.changelog b/community-staging/gliv/gliv.changelog
deleted file mode 100644
index 9b37dd5a9..000000000
--- a/community-staging/gliv/gliv.changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* gliv-1.9.7-1
-
-2010-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#21710 fixed in gliv-1.9.6-3
diff --git a/community-staging/glpng/Makefile b/community-staging/glpng/Makefile
deleted file mode 100644
index d6772798f..000000000
--- a/community-staging/glpng/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-CFLAGS+=-fPIC -Iinclude
-LDFLAGS+=-lpng -lGL
-SHAREDLIBFLAGS=-shared
-DESTDIR=/usr/local
-LIB=lib
-
-all: libglpng.a libglpng.so.1.45
-
-libglpng.a: glpng.o
-	ar rv $@ $<
-
-libglpng.so.1.45: glpng.o
-	gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@
-
-glpng.o: src/glpng.c
-	gcc $(CFLAGS) -c $<
-
-clean:
-	rm glpng.o libglpng.*
-
-install:
-	for i in include include/GL $(LIB); do \
-		install -m 755 -d $(DESTDIR)/$$i; \
-	done
-	install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL
-	install -m 755 libglpng.* $(DESTDIR)/$(LIB)
-	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
-	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so
-
-.PHONY: clean install
diff --git a/community-staging/glpng/PKGBUILD b/community-staging/glpng/PKGBUILD
deleted file mode 100644
index c2530ae09..000000000
--- a/community-staging/glpng/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 62385 2012-01-19 18:48:18Z jelle $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=glpng
-pkgver=1.45
-pkgrel=5
-pkgdesc="Toolkit for loading PNG images as OpenGL textures"
-arch=('i686' 'x86_64')
-url="http://www.fifi.org/doc/libglpng-dev/glpng.html"
-license=('custom')
-depends=('libpng' 'libgl')
-makedepends=('mesa')
-source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz
-        Makefile
-        libpng15.patch
-        license)
-build() {
-  cd "$srcdir/libglpng-1.45.orig"
-
-  patch -Np1 -i "$srcdir/libpng15.patch"
-
-  cp "$srcdir/Makefile" .
-  make libglpng.so.1.45
-}
-
-package() {
-  cd "$srcdir/libglpng-1.45.orig"
-  make DESTDIR="$pkgdir/usr" install
-  install -Dm644 "$srcdir/license" \
-    "$pkgdir/usr/share/licenses/glpng/license"
-}
-md5sums=('9e0daad8e39fbf3179c73c0d3f74f104'
-         '0b24e9cb527d4ed1c43dd743d49d2b54'
-         'f3f0c0a3f867c5856d922c18677ef2a2'
-         'cd066652a6e5dbd7c1fc303b8e03417a')
diff --git a/community-staging/glpng/libpng15.patch b/community-staging/glpng/libpng15.patch
deleted file mode 100644
index 89e9bf67e..000000000
--- a/community-staging/glpng/libpng15.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h
---- libglpng-1.45.orig/include/GL/glpng.h	2000-07-10 21:27:00.000000000 +0200
-+++ libglpng-1.45.new/include/GL/glpng.h	2012-01-19 19:34:43.994280259 +0100
-@@ -57,7 +57,7 @@
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS

- 
- /* Transparency parameters */

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

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

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

- #ifdef GL_COLOR_INDEX1_EXT

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

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

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

- 

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

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

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

- 	{

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

- 		return 0;

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

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

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

- 	{

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

- 		return 0;

-@@ -559,7 +561,7 @@
- 			#define ALPHA *q
- 
- 			switch (trans) {
--				case PNG_CALLBACK:
-+				case PNG_CALLBACKT:
- 					FORSTART
- 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- 					FOREND
diff --git a/community-staging/glpng/license b/community-staging/glpng/license
deleted file mode 100644
index a526262b5..000000000
--- a/community-staging/glpng/license
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * PNG loader library for OpenGL v1.45 (10/07/00)
- * by Ben Wyatt ben@wyatt100.freeserve.co.uk
- * Using LibPNG 1.0.2 and ZLib 1.1.3
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the author be held liable for any damages arising from the
- * use of this software.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject to
- * the following restrictions:
- *
- * 1. The origin of this source code must not be misrepresented. You must not
- *    claim that you wrote the original software. If you use this software in
- *    a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered versions must be plainly marked as such and must not be
- *    misrepresented as being the original source.
- * 3. This notice must not be removed or altered from any source distribution.
- */
diff --git a/community-staging/gmerlin-avdecoder/PKGBUILD b/community-staging/gmerlin-avdecoder/PKGBUILD
deleted file mode 100644
index 5bb466ea2..000000000
--- a/community-staging/gmerlin-avdecoder/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 62902 2012-01-29 00:35:31Z ebelanger $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin-avdecoder
-pkgver=1.1.0
-pkgrel=4
-pkgdesc="Media decoding library"
-arch=('i686' 'x86_64')
-url="http://gmerlin.sourceforge.net/avdec_frame.html"
-license=('GPL')
-depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex'
-         'libdca' 'libmpeg2' 'a52dec')
-source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz)
-md5sums=('c1ea663e9da631453eec4ac79138b6c5')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  rm -f cpuinfo.sh
-  ./configure --prefix=/usr --without-doxygen
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gmerlin/PKGBUILD b/community-staging/gmerlin/PKGBUILD
deleted file mode 100644
index dc67a30bb..000000000
--- a/community-staging/gmerlin/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62900 2012-01-29 00:06:09Z ebelanger $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin
-pkgver=1.0.0
-pkgrel=5
-pkgdesc="Multimedia architecture for Linux"
-arch=('i686' 'x86_64')
-url="http://openmovieeditor.sourceforge.net/HomePage"
-license=('GPL')
-depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
-makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
-optdepends=('alsa-lib: for ALSA support'
-	    'jack: for JACK support'
-	    'libquicktime: for movie encoding'
-	    'pulseaudio: for PulseAudio support'
-	    'v4l-utils: for video conversion')
-options=('!libtool' '!makeflags')
-install=gmerlin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	libpng.patch)
-md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6'
-         'c262023434246705296d97bc7337a212')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  rm -rf cpuinfo.sh
-
-  patch -p1 -i "$srcdir/libpng.patch"
-  ./configure --prefix=/usr --without-doxygen
-  sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile
-  sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-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/gmic/PKGBUILD b/community-staging/gmic/PKGBUILD
deleted file mode 100644
index 5166bd65d..000000000
--- a/community-staging/gmic/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 62764 2012-01-26 14:17:03Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud@gmail.com>
-
-pkgbase=gmic
-pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.8
-pkgrel=2
-pkgdesc="image procession framework"
-arch=('i686' 'x86_64')
-license=('custom:CeCILL')
-url="http://gmic.sourceforge.net"
-makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
-options=('docs' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
-	opencv-buildfix.patch)
-md5sums=('530e733b81e3c1cca7f17bfad4a56821'
-         'f135182ced743c296e08ddd560fa6be9')
-
-build() {
-  cd "$srcdir/gmic-$pkgver"
-  CFLAGS+=" -Dcimg_use_lapack"
-  LDFLAGS="-llapack"
-  sed -i "s#-lhighgui#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  sed -i "s#-lcv#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  ./configure --prefix=/usr
-  sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile
-  sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile
-  sed -i 's|cp -f gmic_gimp.*||' src/Makefile
-  sed -i 's|ln -s $(DESTDIR)$(USR)|ln -s $(USR)|' src/Makefile
-  patch -p1 <$srcdir/opencv-buildfix.patch
-  make -C src all
-}
-
-package_gmic() {
-  depends=('fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr')
-  replaces=('greycstoration')
-
-  cd "$srcdir/gmic-$pkgver"
-  make -C src install DESTDIR="$pkgdir" USR=/usr
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE"
-}
-
-package_gimp-plugin-gmic() {
-  pkgdesc="Gimp plugin for the GMIC image procession framework"
-  depends=('gimp' 'fftw' 'lapack')
-  replaces=('gimp-plugin-greycstoration' 'gimp-plugin-gmic4gimp')
-
-  cd "$srcdir/gmic-$pkgver"
-  install -Dm755 src/gmic_gimp "$pkgdir/usr/lib/gimp/2.0/plug-ins/gmic_gimp"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/gimp-plugin-gmic/LICENSE"
-}
diff --git a/community-staging/gmic/opencv-buildfix.patch b/community-staging/gmic/opencv-buildfix.patch
deleted file mode 100644
index 7fda2ea54..000000000
--- a/community-staging/gmic/opencv-buildfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h
---- gmic-1.5.0.3.org/src/CImg.h	2011-09-22 18:37:54.000000000 +0400
-+++ gmic-1.5.0.3/src/CImg.h	2011-10-05 18:03:25.000000000 +0400
-@@ -234,7 +234,11 @@
- // Using OpenCV is not mandatory.
- #ifdef cimg_use_opencv
- #include <cstddef>
-+#undef True
-+#undef False
- #include "cv.h"
-+#define True 1
-+#define False 0
- #include "highgui.h"
- #endif
- 
diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD
deleted file mode 100644
index 348db3561..000000000
--- a/community-staging/gnash/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.9
-pkgrel=9
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
-             speex fontconfig libva ffmpeg libxinerama
-             gstreamer0.10-base gstreamer0.10-ffmpeg
-             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils
-             pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        gentoo-ffmpeg-0.8.patch xul8.patch nodebug.patch)
-sha256sums=('f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd'
-            '5e6b9c2ccb0f6dda70745712dddf302d2b42895feda850f2ed126bf53d8815ca'
-            'd484f1c21ef71847a2d4b3dd254d1fa93a58719d45bc9df8b8deabee388ce4e9'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
-
-build() {
-  cd "$srcdir/gnash-$pkgver"
-
-  # Consolidated gentoo patches for ffmpeg compatibility
-  # as of 2011-10-31
-  patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch"
-
-  # Patch for compatibility with newer xulrunner headers
-  patch -Np1 -i "$srcdir/xul8.patch"
-
-  # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i "$srcdir/nodebug.patch"
-
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-plugins-install=system \
-    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
-    --enable-gui=sdl,gtk \
-    --enable-renderer=agg \
-    --enable-media=gst,ffmpeg \
-    --enable-hwaccel=vaapi
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_gnash-common() {
-  pkgdesc="A GNU Flash movie player"
-  depends=(curl giflib libldap sdl agg libjpeg libpng libtool
-           speex fontconfig libva ffmpeg libxinerama
-           gstreamer0.10-base gstreamer0.10-ffmpeg
-           boost-libs)
-  backup=(etc/gnashrc)
-
-  cd "$srcdir/gnash-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Split gnash-gtk
-  mkdir -p "$srcdir"/gtk/{bin,man1,share}
-  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/"
-  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/"
-  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/"
-  mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/"
-}
-
-package_gnash-gtk() {
-  pkgdesc="A GNU Flash movie player"
-  depends=("gnash-common=$pkgver"
-            gtk2 libldap hicolor-icon-theme desktop-file-utils)
-  install=gnash-gtk.install
-  backup=(etc/gnashpluginrc)
-
-  cd "$srcdir/gnash-$pkgver"
-
-  make DESTDIR="$pkgdir" install-plugin
-
-  install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}}
-  mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/"
-  mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/"
-  mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/"
-  mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/"
-}
diff --git a/community-staging/gnash/gentoo-ffmpeg-0.8.patch b/community-staging/gnash/gentoo-ffmpeg-0.8.patch
deleted file mode 100644
index d74bcc8e0..000000000
--- a/community-staging/gnash/gentoo-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-10-31 17:25:56.057379760 +0100
-@@ -29,7 +29,7 @@
- 
- //#define GNASH_DEBUG_AUDIO_DECODING
- 
--#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2
-+#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3
- 
- namespace gnash {
- namespace media {
-@@ -549,8 +549,12 @@
- #endif
- 
-     // older ffmpeg versions didn't accept a const input..
-+    AVPacket pkt;
-+    av_init_packet(&pkt);
-+    pkt.data = (uint8_t*) input;
-+    pkt.size = inputSize;
-     int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize,
--                                   input, inputSize);
-+                                   &pkt);
- 
- #ifdef GNASH_DEBUG_AUDIO_DECODING
-     log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) "
-@@ -658,13 +662,13 @@
- {
-     if ( _needsParsing )
-     {
--        return av_parser_parse(_parser, _audioCodecCtx,
-+        return av_parser_parse2(_parser, _audioCodecCtx,
-                     // as of 2008-10-28 SVN, ffmpeg doesn't
-                     // accept a pointer to pointer to const..
-                     const_cast<boost::uint8_t**>(outFrame),
-                     outFrameSize,
-                     input, inputSize,
--                    0, 0); // pts & dts
-+                    0, 0, AV_NOPTS_VALUE); // pts & dts
-     }
-     else
-     {
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-10-31 17:25:51.210668136 +0100
-@@ -46,8 +46,10 @@
- {
-   if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) {
-     if ( ! _context ) {
--      _context = audio_resample_init( 
--		2, ctx->channels, 44100, ctx->sample_rate 
-+      _context = av_audio_resample_init( 
-+		2, ctx->channels, 44100, ctx->sample_rate,
-+		AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
-+		16, 10, 0, 0.8
- 	);
-     }
- 
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-10-31 17:25:57.720728522 +0100
-@@ -387,7 +387,7 @@
-     
-     log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
-         _inputFmt->name, _formatCtx->nb_streams);
--    
-+    /*
-     if ( _formatCtx->title[0] )
-         log_debug(_("  Title:'%s'"), _formatCtx->title);
-     if ( _formatCtx->author[0] )
-@@ -398,7 +398,7 @@
-         log_debug(_("  Comment:'%s'"), _formatCtx->comment);
-     if ( _formatCtx->album[0] )
-         log_debug(_("  Album:'%s'"), _formatCtx->album);
--    
-+    */
-     // Find first audio and video stream
-     for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++)
- 	{
-@@ -415,7 +415,7 @@
- 	    }
- 	    
- 	    switch (enc->codec_type) {
--	    case CODEC_TYPE_AUDIO:
-+	    case AVMEDIA_TYPE_AUDIO:
- 		if (_audioStreamIndex < 0) {
- 		    _audioStreamIndex = i;
- 		    _audioStream = _formatCtx->streams[i];
-@@ -425,7 +425,7 @@
- 		}
- 		break;
- 		
--	    case CODEC_TYPE_VIDEO:
-+	    case AVMEDIA_TYPE_VIDEO:
- 		if (_videoStreamIndex < 0) {
- 		    _videoStreamIndex = i;
- 		    _videoStream = _formatCtx->streams[i];
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-10-31 17:25:54.590699488 +0100
-@@ -356,8 +356,12 @@
- 
-     int bytes = 0;    
-     // no idea why avcodec_decode_video wants a non-const input...
--    avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes,
--            input, input_size);
-+    AVPacket pkt;
-+    av_init_packet(&pkt);
-+    pkt.data = (uint8_t*) input;
-+    pkt.size = input_size;
-+    avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes,
-+            &pkt);
-     
-     if (!bytes) {
-         log_error("Decoding of a video frame failed");
-diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4
---- gnash-0.8.9/macros/ffmpeg.m4	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-ff/macros/ffmpeg.m4	2011-10-31 17:25:49.700654130 +0100
-@@ -22,6 +22,7 @@
-   backupLIBS="$LIBS"
-   backupCFLAGS="$CFLAGS"
-   avcodec_h=""
-+  avcodec_version_h=""
-   ffmpeg_top_incl=""
- 
-   dnl If the user specify an path to include headers from, we assume it's the full
-@@ -46,6 +47,9 @@
-       else
-         AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header])
-       fi
-+      if test -f ${with_ffmpeg_incl}/version.h; then
-+        avcodec_version_h=${with_ffmpeg_incl}/version.h
-+      fi
-     fi
-   ])
- 
-@@ -66,6 +70,9 @@
-           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
-             avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
-+            if test -f ${ffmpeg_top_incl}/${i}/version.h; then
-+              avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
-+            fi
-             break
-           fi
-         done
-@@ -83,6 +90,9 @@
-         if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-           ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`"
-           avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h
-+          if test -f ${ffmpeg_top_incl}/${i}/version.h; then
-+            avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
-+          fi
-           break
-         fi
-       done
-@@ -182,14 +192,24 @@
-   dnl a modified form of grepping may be better, making sure all old kinds of
-   dnl version numbering fail gracefully.
- 
-+  versionfile=""
-+
-   dnl Check avcodec version number, if it was found
--  if test x"${avcodec_h}" != x; then
-+  if test x"${avcodec_version_h}" != x; then
-+    versionfile=${avcodec_version_h}
-+  else
-+    if test x"${avcodec_h}" != x; then
-+      versionfile=${avcodec_h}
-+    fi
-+  fi
-+
-+  if test x"${versionfile}" != x; then
- 
-     AC_MSG_CHECKING([ffmpeg version])
- 
--    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
--    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
--    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
- 
-     if test x"${ffmpeg_major_version}" != x ; then
- 
-@@ -198,15 +218,15 @@
-     else
- 
-       dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
--      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"`
-+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
- 
-       if test x"${ffmpeg_version}" = x ; then
- 
-         dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
--        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
-+        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
- 
-         if test x"${ffmpeg_version}" = x ; then
--          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'`
-+          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'`
-         fi
-       fi
- 
diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install
deleted file mode 100644
index c317fbaca..000000000
--- a/community-staging/gnash/gnash-gtk.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-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/gnash/xul8.patch b/community-staging/gnash/xul8.patch
deleted file mode 100644
index 7bd708b2d..000000000
--- a/community-staging/gnash/xul8.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp
---- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp	2011-11-18 16:25:55.198007371 +0100
-@@ -238,7 +238,7 @@
-     return NS_PluginInitialize();
- }
- 
--char *
-+const char *
- NP_GetMIMEDescription(void)
- {
-     return NPP_GetMIMEDescription();
-diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp
---- gnash-0.8.9/plugin/npapi/plugin.cpp	2011-03-18 14:44:30.000000000 +0100
-+++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp	2011-11-18 16:35:42.496794816 +0100
-@@ -128,10 +128,10 @@
- }
- 
- /// \brief Return the MIME Type description for this plugin.
--char*
-+const char*
- NPP_GetMIMEDescription(void)
- {
--    return const_cast<char *>(MIME_TYPES_DESCRIPTION);
-+    return MIME_TYPES_DESCRIPTION;
- }
- 
- static bool waitforgdb = false;
-diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp
---- gnash-0.8.9/plugin/npapi/test.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-xul/plugin/npapi/test.cpp	2011-11-18 16:37:06.997539299 +0100
-@@ -408,10 +408,10 @@
- {
- }
- 
--char*
-+const char*
- NPP_GetMIMEDescription(void)
- {
--    char *x = 0;
-+    const char *x = 0;
-     return x;
- }
- 
diff --git a/community-staging/gnubiff-gtk/PKGBUILD b/community-staging/gnubiff-gtk/PKGBUILD
deleted file mode 100644
index f57633872..000000000
--- a/community-staging/gnubiff-gtk/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62514 2012-01-20 09:52:01Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-# Contributor: Todd Musall <tmusall@gmail.com>
-
-pkgname=gnubiff-gtk
-pkgver=2.2.13
-pkgrel=4
-pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version."
-arch=('i686' 'x86_64')
-url="http://gnubiff.sourceforge.net/"
-license=("GPL")
-depends=('libglade' 'openssl' 'popt')
-makedepends=('intltool')
-conflicts=(gnubiff)
-source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz
-	build.patch)
-md5sums=('65423957eb027b94c9e661611c0e4271'
-         '96fde605eb69e300f6014546d4339beb')
-
-build() {
-  cd $srcdir/gnubiff-$pkgver
-  patch -p1 <../build.patch
-  export LDFLAGS=-lX11
-  ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271"
-  make
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/lib
-  rm -rf $pkgdir/usr/share/gnome-2.0
-  rm -rf ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-staging/gnubiff-gtk/build.patch b/community-staging/gnubiff-gtk/build.patch
deleted file mode 100644
index 523b0557e..000000000
--- a/community-staging/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-staging/gnubiff/PKGBUILD b/community-staging/gnubiff/PKGBUILD
deleted file mode 100644
index e53334a8e..000000000
--- a/community-staging/gnubiff/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62993 2012-01-30 09:15:21Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-# Contributor: Todd Musall <tmusall@gmail.com>
-
-pkgname=gnubiff
-pkgver=2.2.14
-pkgrel=1
-pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
-arch=('i686' 'x86_64')
-url="http://gnubiff.sourceforge.net/"
-license=("GPL")
-depends=('libglade' 'gtk3' 'popt')
-makedepends=('perlxml' 'intltool')
-conflicts=(gnubiff-gtk)
-source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24')
-
-build() {
-  [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
-  cd $srcdir/gnubiff-$pkgver
-
-  ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
-	--disable-fam --disable-gnome
-  make
-  make DESTDIR=$pkgdir install
-
-  rm -rf ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-staging/gnustep-gui/ChangeLog b/community-staging/gnustep-gui/ChangeLog
deleted file mode 100644
index 15622ab88..000000000
--- a/community-staging/gnustep-gui/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* version upgrade
diff --git a/community-staging/gnustep-gui/PKGBUILD b/community-staging/gnustep-gui/PKGBUILD
deleted file mode 100644
index 584d5a038..000000000
--- a/community-staging/gnustep-gui/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62400 2012-01-19 19:38:10Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Sebastian Sareyko <public@nooms.de>
-
-pkgname=gnustep-gui
-pkgver=0.20.0
-pkgrel=3
-pkgdesc="The GNUstep GUI class library"
-arch=('i686' 'x86_64')
-url="http://www.gnustep.org/"
-license=('LGPL')
-depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
-makedepends=('gcc-objc')
-conflicts=('gnustep-gui-svn')
-groups=('gnustep-core')
-options=('!makeflags')
-source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  . /etc/profile.d/GNUstep.sh
-  ./configure --prefix=/usr --sysconfdir=/etc/GNUstep
-  sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD
deleted file mode 100644
index dec36fb2e..000000000
--- a/community-staging/gpac/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62409 2012-01-19 20:53:21Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=3824
-pkgrel=2
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-license=('LGPL')
-depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa')
-makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad')
-optdepends=('jack: for jack support' 'a52dec: for A52 support'
-            'faad2: for AAC support' 'libmad: for mp3 support')
-options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('bf7039c2585d539475babc7996851627efd7ec59')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=$pkgver
-  _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  echo "#define GPAC_SVN_REVISION	\"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-staging/gpsim/PKGBUILD b/community-staging/gpsim/PKGBUILD
deleted file mode 100644
index 99ea07ca7..000000000
--- a/community-staging/gpsim/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 62452 2012-01-20 07:07:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: mickael9 <mickael9 at gmail dot com>
-
-pkgname=gpsim
-pkgver=0.26.1
-pkgrel=2
-pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers"
-arch=(i686 x86_64)
-url="http://gpsim.sourceforge.net/"
-license=(GPL)
-depends=('gtk2+extra' 'popt')
-makedepends=('gtk2+extra')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c994c23d2d75056dbefcf5d1d63596d7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/grace/PKGBUILD b/community-staging/grace/PKGBUILD
deleted file mode 100644
index 2d793fa6d..000000000
--- a/community-staging/grace/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62455 2012-01-20 07:08:00Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=grace
-pkgver=5.1.22
-pkgrel=6
-pkgdesc="2D plotting tool"
-arch=(i686 x86_64)
-url="http://plasma-gate.weizmann.ac.il/Grace/"
-depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf')
-makedepends=('netcdf' 'fftw')
-license=('GPL')
-source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz)
-md5sums=('672356466f18fe59ed21a8fb44f9851d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i '1,1i#include <zlib.h>' src/rstdrv.c
-  sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|g' src/rstdrv.c
-  ./configure   --prefix=/usr --exec-prefix=/usr \
-		--enable-grace-home=/usr/share/grace \
-		--includedir=/usr/include --libdir=/usr/lib \
-		-with-helpviewer="firefox %s"
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  cd $pkgdir/usr/share/grace && mv bin lib include ../../
-}
diff --git a/community-staging/grafx2/PKGBUILD b/community-staging/grafx2/PKGBUILD
deleted file mode 100644
index c885baea2..000000000
--- a/community-staging/grafx2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62301 2012-01-19 07:23:27Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Simon Parzer <simon.parzer@gmail.com>
-pkgname=grafx2
-pkgver=2.3
-pkgrel=3
-pkgdesc="Pixelart-oriented painting program"
-arch=('x86_64' 'i686')
-url="http://code.google.com/p/grafx2/"
-license=('GPL2')
-install=grafx2.install
-depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils')
-source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz"
-        "grafx2.desktop")
-md5sums=('916a35c4762e85b4210a1041fbbfd830'
-         '9b3ecb5c2d44b987d65257184f46e6c4')
-
-build() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Compiling..."
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Packaging files..."
-  make prefix="/usr" DESTDIR="$pkgdir" install
-  msg2 "Packaging shortcut..."
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  msg2 "Packaging documentation..."
-  install -Dm644 "$srcdir/$pkgname/doc/README.txt" \
-    "$pkgdir/usr/share/doc/$pkgname/readme.txt"
-  msg2 "Packaging license..."
-  install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  msg2 "Cleaning up..."
-  rmdir "$pkgdir/usr/share/grafx2/scripts/libs"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/grafx2/grafx2.desktop b/community-staging/grafx2/grafx2.desktop
deleted file mode 100644
index d58bc5ed3..000000000
--- a/community-staging/grafx2/grafx2.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=GrafX2
-Name=GrafX2
-Comment=Pixelart-oriented painting program
-Exec=grafx2 %U
-TryExec=grafx2
-Icon=grafx2
-Terminal=false
-Type=Application
-Categories=Graphics;2DGraphics;RasterGraphics
-MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff
diff --git a/community-staging/grafx2/grafx2.install b/community-staging/grafx2/grafx2.install
deleted file mode 100644
index 12589796c..000000000
--- a/community-staging/grafx2/grafx2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=grafx2
-
-post_upgrade() {
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gsql/PKGBUILD b/community-staging/gsql/PKGBUILD
deleted file mode 100644
index 67af0c006..000000000
--- a/community-staging/gsql/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62366 2012-01-19 17:48:19Z spupykin $
-# Contributor: Michael Kanis <mkanis@gmx.de>
-
-pkgname=gsql
-pkgver=0.2.2
-pkgrel=4
-pkgdesc="Integrated database development tool for GNOME"
-url="http://gsql.org/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf'
-	 'desktop-file-utils' 'libnotify')
-makedepends=('libmysqlclient' 'postgresql-libs' 'libssh')
-optdepends=('libmysqlclient' 'postgresql-libs' 'libssh')
-install=gsql.install
-options=(!libtool)
-source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8f3322a75390584729e84a8570e08bea')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/community-staging/gsql/gsql.install b/community-staging/gsql/gsql.install
deleted file mode 100644
index e069ea8fc..000000000
--- a/community-staging/gsql/gsql.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gsql
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/gtk-chtheme/PKGBUILD b/community-staging/gtk-chtheme/PKGBUILD
deleted file mode 100644
index 4b959b86f..000000000
--- a/community-staging/gtk-chtheme/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62546 2012-01-20 20:23:30Z giovanni $
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-chtheme
-pkgver=0.3.1
-pkgrel=7
-pkgdesc="This little program lets you change your Gtk+ 2.0 theme. A better alternative to switch2"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://plasmasturm.org/programs/gtk-chtheme/"
-depends=('gtk2')
-source=("http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f688053bf26dd6c4f1cd0bf2ee33de2a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Fix xdg compliancy
-  sed -i 's|-DGTK.*||' Makefile
-  sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme
-}
diff --git a/community-staging/gtk-engine-murrine/PKGBUILD b/community-staging/gtk-engine-murrine/PKGBUILD
deleted file mode 100644
index cbcd69f86..000000000
--- a/community-staging/gtk-engine-murrine/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62478 2012-01-20 09:02:37Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: detto <detto-brumm@freenet.de>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-engine-murrine
-pkgver=0.98.1.1
-pkgrel=3
-pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers."
-arch=('i686' 'x86_64')
-url="http://cimitan.com/murrine/project/murrine"
-license=('LGPL3')
-depends=('gtk2')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.bz2)
-sha256sums=('e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912')
-
-build() {
-  cd murrine-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --enable-animation \
-    --enable-animationrtl
-  make
-}
-
-package() {
-  cd murrine-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/guake/0001-Retrieve-port-as-int.2.patch b/community-staging/guake/0001-Retrieve-port-as-int.2.patch
deleted file mode 100644
index 3fde26dc2..000000000
--- a/community-staging/guake/0001-Retrieve-port-as-int.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001
-From: pingou <pingou@pingoured.fr>
-Date: Mon, 23 Aug 2010 09:54:35 +0200
-Subject: [PATCH] Retrieve port as int
-
----
- src/guake.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/guake.py b/src/guake.py
-index 6214fb2..40e688f 100644
---- a/src/guake.py
-+++ b/src/guake.py
-@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp):
-                 ssl_port = port
-             else:
-                 ssl_host = self.client.get_string('/system/proxy/secure_host')
--                ssl_port = self.client.get_string('/system/proxy/secure_port')
-+                ssl_port = self.client.get_int('/system/proxy/secure_port')
- 
-             if self.client.get_bool(proxy + 'use_authentication'):
-                 auth_user = self.client.get_string(
--- 
-1.7.2.1
-
diff --git a/community-staging/guake/PKGBUILD b/community-staging/guake/PKGBUILD
deleted file mode 100644
index f72b69bd7..000000000
--- a/community-staging/guake/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 62909 2012-01-29 04:37:40Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
-pkgname=guake
-pkgver=0.4.2
-pkgrel=5
-pkgdesc='is a drop-down terminal for Gnome Desktop Environment'
-arch=('i686' 'x86_64')
-url='http://guake.org'
-license=('GPL')
-depends=('python-notify' 'vte' 'gconf' 'python2-gconf' 'dbus-python' 'notification-daemon')
-makedepends=('libx11' 'pkgconfig' 'perlxml' 'intltool')
-install=guake.install
-source=(http://guake.org/files/guake-$pkgver.tar.gz
-        http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch)
-md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
-         '9aca6ba8e46ae1b69958cda0e03320ff')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Point Python scripts to the python2 binary
-  sed -i 's|bin/python"|bin/python2"|' src/guake{,-prefs}.in
-
-  # Patch to import proxy port setting as int (http://guake.org/ticket/246)
-  patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch"
-
-  ./configure --sysconfdir=/usr/share --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/guake/guake.install b/community-staging/guake/guake.install
deleted file mode 100644
index 1e828c86b..000000000
--- a/community-staging/guake/guake.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=guake
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/community-staging/hatari/PKGBUILD b/community-staging/hatari/PKGBUILD
deleted file mode 100644
index 5127f3c2e..000000000
--- a/community-staging/hatari/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62935 2012-01-29 11:52:39Z svenstaro $
-# Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-
-pkgname=hatari
-pkgver=1.5.0
-pkgrel=2
-pkgdesc='An Atari ST and STE emulator'
-arch=('i686' 'x86_64')
-url='http://hatari.sourceforge.net/'
-license=('GPL')
-depends=('sdl' 'libpng')
-makedepends=('cmake')
-source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('16277cff73ec3a342b87b7b7ea3932f4')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/htmldoc/PKGBUILD b/community-staging/htmldoc/PKGBUILD
deleted file mode 100644
index 27af9e340..000000000
--- a/community-staging/htmldoc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 62369 2012-01-19 17:50:49Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch>
-
-pkgname=htmldoc
-pkgver=1.8.27
-pkgrel=7
-pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices"
-arch=(i686 x86_64)
-url="http://www.htmldoc.org"
-license=('GPL')
-depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm')
-source=(ftp://ftp.easysw.com/pub/${pkgname}/${pkgver}/${pkgname}-$pkgver-source.tar.bz2)
-md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-
-  make install \
-	prefix=${pkgdir}/usr \
-	bindir=$pkgdir/usr/bin \
-	datadir=$pkgdir/usr/share \
-	datarootdir=$pkgdir/usr/share \
-	docdir=$pkgdir/usr/share/doc/htmldoc \
-	exec_prefix=$pkgdir/usr \
-	mandir=$pkgdir/usr/share/man \
-	prefix=$pkgdir/usr \
-	sysconfdir=$pkgdir/etc
-
-  # freedesktop stuff
-  install -Dm 644 desktop/htmldoc-128.png \
-    $pkgdir/usr/share/pixmaps/htmldoc.png
-  echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop
-  sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop
-  install -Dm 644 desktop/htmldoc.desktop \
-    $pkgdir/usr/share/applications/htmldoc.desktop
-}
diff --git a/community-staging/icoutils/PKGBUILD b/community-staging/icoutils/PKGBUILD
deleted file mode 100644
index 8f8813cbd..000000000
--- a/community-staging/icoutils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: neodreams <yanbrodeur@videotron.ca>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=icoutils
-pkgver=0.29.1
-pkgrel=2
-pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.nongnu.org/icoutils/'
-depends=('libpng>=1.0.0' 'perl-libwww>=5.64')
-source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/irrlicht/PKGBUILD b/community-staging/irrlicht/PKGBUILD
deleted file mode 100644
index e09464faa..000000000
--- a/community-staging/irrlicht/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 62449 2012-01-20 06:59:03Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com>
-# Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
-# Contributor: Paolo Fagni <paolo.fagni AT mail DOT com>
-# Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com>
-
-pkgname=irrlicht
-pkgver=1.7.2
-pkgrel=4
-pkgdesc="An open source high performance realtime 3D graphics engine."
-arch=('i686' 'x86_64')
-url="http://irrlicht.sourceforge.net/"
-license=('ZLIB')
-depends=('libgl' 'libjpeg' 'bzip2' 'libpng')
-makedepends=('mesa' 'unzip')
-source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip"
-        "irrlicht-1.7.2-libpng15.patch")
-md5sums=('eb627d4c432bf73f12bc6d9ddc700b07'
-         'a7f8d4aa1bc2880bbeaf3449e09f69a5')
-noextract=($pkgname-$pkgver.zip)
-
-build() {
-  unzip $pkgname-$pkgver.zip
-
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np0 < $srcdir/irrlicht-1.7.2-libpng15.patch
-
-  sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \
-         -e '/^#.*NON_SYSTEM_JPEG/d' \
-         -e '/^#.*NON_SYSTEM_LIB_PNG/d' \
-         -e '/^#.*NON_SYSTEM_BZLIB/d' \
-         include/IrrCompileConfig.h
-
-  cd source/Irrlicht
-  sed -i -e '/^CXXFLAGS/s:-g.*::' \
-	 -e '/^CXXFLAGS/s:-Wall::' \
-	 -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \
-	 -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
-	 -e '/^ZLIBOBJ/d' \
-	 -e '/^JPEGLIBOBJ/d' \
-	 -e '/^BZIP2OBJ/d' \
-	 -e '/^LIBPNGOBJ/d' \
-	 -e '/.o=.d/d' \
-	 -e '/^staticlib sharedlib: LDFLAGS/s:+=.*:+= -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz:' \
-	 -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \
-	 -e 's/0-SVN/1/' \
-	 -e 's/.$(VERSION_MINOR) -o/ -o/' \
-	 Makefile
-
-  sed -i "s/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/" \
-      CImageLoaderPNG.cpp
-
-  make sharedlib
-
-  make
-
-  install -d $pkgdir/usr/lib \
-             $pkgdir/usr/share/licenses/$pkgname \
-             $pkgdir/usr/share/$pkgname/examples/bin \
-             $pkgdir/usr/share/doc/$pkgname
-
-  make install
-
-  cd $srcdir/$pkgname-$pkgver/
-  install -m644 readme.txt $pkgdir/usr/share/licenses/$pkgname
-
-  # Install static library and fix headers permissions
-  install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib
-  chmod 644 $pkgdir/usr/include/$pkgname/*
-
-  # Install media files for examples
-  cp -r media $pkgdir/usr/share/$pkgname
-
-  # Install documentation
-  cp -r doc/* $pkgdir/usr/share/doc/$pkgname
-  rm -f $pkgdir/usr/share/doc/$pkgname/*.txt
-
-  cd $pkgdir/usr/lib
-  ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1
-
-  # Just a helper for examples compilation
-  ln -s libIrrlicht.so.$pkgver $srcdir/$pkgname-$pkgver/lib/Linux/libIrrlicht.so
-
-  # Edit, build and install the examples
-  cd $srcdir/$pkgname-$pkgver/examples
-  sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h
-  sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *)
-
-  make
-
-  install -m755  ../bin/Linux/* /$pkgdir/usr/share/$pkgname/examples/bin/
-}
diff --git a/community-staging/irrlicht/irrlicht-1.7.2-libpng15.patch b/community-staging/irrlicht/irrlicht-1.7.2-libpng15.patch
deleted file mode 100644
index a1426bf29..000000000
--- a/community-staging/irrlicht/irrlicht-1.7.2-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- source/Irrlicht/CImageLoaderPNG.cpp
-+++ source/Irrlicht/CImageLoaderPNG.cpp
-@@ -28,7 +28,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

- {

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

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

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

- }

- 

- // PNG function for file reading

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

- 

- 	// changed by zola {

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

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

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

- 	// }

- 

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

- {

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

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

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

- }

- 

- // PNG function for file writing

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

- 	png_size_t check;

- 

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

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

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

- 

- 	if (check != length)

diff --git a/community-staging/jwm/PKGBUILD b/community-staging/jwm/PKGBUILD
deleted file mode 100644
index 4c96d14c6..000000000
--- a/community-staging/jwm/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 62417 2012-01-19 21:22:13Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=jwm
-pkgver=2.1.0
-pkgrel=2
-pkgdesc="A lightweight window manager for the X11 Window System"
-arch=('i686' 'x86_64')
-url="http://joewing.net/programs/jwm/"
-license=('GPL2')
-depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng')
-backup=('etc/system.jwmrc')
-source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2)
-md5sums=('e8fab21b2410eb82032b7c3472af642c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-fribidi 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" \
-       SYSCONF="$pkgdir/etc" install
-}
diff --git a/community-staging/kovpn/ChangeLog b/community-staging/kovpn/ChangeLog
deleted file mode 100644
index d8e35c402..000000000
--- a/community-staging/kovpn/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-25 Georg Grabler (STiAT) <ggrabler@gmail.com>
-* Added libtool option
diff --git a/community-staging/kovpn/PKGBUILD b/community-staging/kovpn/PKGBUILD
deleted file mode 100644
index 5b5ccfb63..000000000
--- a/community-staging/kovpn/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 62371 2012-01-19 17:53:21Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=kovpn
-pkgver=0.3pre7
-_pkgver=0.3.pre7
-pkgrel=6
-pkgdesc="An OpenVPN client management interface for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=37043"
-license=('GPL')
-depends=('openvpn' 'kdelibs3' 'xdg-utils')
-makedepends=('automake' 'autoconf')
-options=('libtool')
-install=kovpn.install
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
-source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2"
-	"kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173")
-md5sums=('19b61cf9f84088baffbd5bb0a287422c'
-         '21171b74f76289daea1cc61eedaa4dba')
-
-build() {
-  cd $srcdir/$pkgname-$_pkgver
-
-  unset LDFLAGS
-  . /etc/profile.d/qt3.sh
-  export PATH=$QTDIR/bin:$PATH
-  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-
-  patch -Np1 -i ../kovpn-disable-dcop.patch
-  sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-  ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt
-  make
-  make prefix=$pkgdir/usr install
-}
diff --git a/community-staging/kovpn/kovpn.install b/community-staging/kovpn/kovpn.install
deleted file mode 100644
index b4ee8556f..000000000
--- a/community-staging/kovpn/kovpn.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
diff --git a/community-staging/leptonica/PKGBUILD b/community-staging/leptonica/PKGBUILD
deleted file mode 100644
index b032a5595..000000000
--- a/community-staging/leptonica/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62320 2012-01-19 08:26:31Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Christoph Drexler <chrdr at gmx dot at>
-
-pkgname=leptonica
-pkgver=1.68
-pkgrel=3
-pkgdesc="Software that is broadly useful for image processing and image analysis applications"
-arch=('i686' 'x86_64')
-url="http://www.leptonica.com/"
-license=('custom')
-depends=('glibc')
-makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib')
-# 'webp'
-optdepends=('giflib:  for supporting gif files'
-	    'gnuplot: gnuplot support'
-	    'libjpeg: for supporting jpeg files'
-	    'libpng:  for supporting png files'
-	    'libtiff: for supporting tiff files'
-	    'zlib:    for supporting compressed files')
-#	    'webp:    for supporting webp files'
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
-md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403')
-
-build() {
-  cd ${srcdir}/leptonica-${pkgver}
-  sed -i '1,1i#include <zlib.h>' src/pngio.c
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/leptonica-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt
-}
diff --git a/community-staging/libgda3/PKGBUILD b/community-staging/libgda3/PKGBUILD
deleted file mode 100644
index 6c60e7f5b..000000000
--- a/community-staging/libgda3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 61461 2011-12-31 21:14:10Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libgda3
-pkgver=3.1.5
-pkgrel=11
-pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
-arch=('i686' 'x86_64')
-url="http://www.gnome-db.org/Download"
-license=('GPL')
-depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs'
-         'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng')
-options=('!libtool' '!distcc')
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2)
-md5sums=('eb7da5286a112e7cff3111c89fba4456')
-
-build() {
-  cd "$srcdir/libgda-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package(){
-  cd "$srcdir/libgda-$pkgver"
-  make DESTDIR=$pkgdir install
-  cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \;
-}
diff --git a/community-staging/libgeotiff/PKGBUILD b/community-staging/libgeotiff/PKGBUILD
deleted file mode 100644
index daa4cb449..000000000
--- a/community-staging/libgeotiff/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62808 2012-01-27 07:11:48Z ebelanger $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgeotiff
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="A TIFF based interchange format for georeferenced raster imagery"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.remotesensing.org/geotiff"
-depends=('libtiff' 'proj' 'libjpeg>=7')
-options=('!makeflags' '!libtool')
-source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz)
-md5sums=('6ac3c22e44711e9a3add9044e40b9527')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
- 	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/libgeotiff/LICENSE"
-}
diff --git a/community-staging/libgtksourceviewmm2/PKGBUILD b/community-staging/libgtksourceviewmm2/PKGBUILD
deleted file mode 100644
index 0e7cd6e6b..000000000
--- a/community-staging/libgtksourceviewmm2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62937 2012-01-29 11:55:17Z svenstaro $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=libgtksourceviewmm2
-pkgver=2.10.1
-pkgrel=2
-pkgdesc='A C++ API for gtksourceview2'
-arch=('i686' 'x86_64')
-url='http://projects.gnome.org/gtksourceviewmm/'
-license=('LGPL')
-depends=('gtkmm' 'gtksourceview2')
-makedepends=('doxygen' 'glibmm-docs')
-options=('!libtool' '!emptydirs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.bz2")
-md5sums=('83d1b3dc061f02f4ff1766b37302058e')
-
-build() {
-  cd gtksourceviewmm-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd gtksourceviewmm-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/libharu/PKGBUILD b/community-staging/libharu/PKGBUILD
deleted file mode 100644
index 862dab0ce..000000000
--- a/community-staging/libharu/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 62648 2012-01-23 08:59:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : SpepS <dreamspepser at yahoo dot it>
-# Contributor: Auguste <auguste@gmail.com>
-# Contributor: Jose Negron <josenj.arch@mailnull.com>
-
-pkgname=libharu
-pkgver=2.2.1
-pkgrel=2
-pkgdesc="C/C++ library for generating PDF documents"
-url="http://libharu.org/wiki/Main_Page"
-arch=('i686' 'x86_64')
-license=('custom:ZLIB')
-depends=('libpng' 'gcc-libs')
-options=(!libtool)
-source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz"
-	libpng15.patch)
-md5sums=('63da8e087744f1d6cf16f9501b1cb766'
-         '3793dd30017474bcd277af3b419bc0f6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-  # license
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  sed -n '102,120p' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-staging/libharu/libpng15.patch b/community-staging/libharu/libpng15.patch
deleted file mode 100644
index 05a8d39fc..000000000
--- a/community-staging/libharu/libpng15.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff -wbBur libharu-2.2.1/src/hpdf_image_png.c libharu-2.2.1.my/src/hpdf_image_png.c
---- libharu-2.2.1/src/hpdf_image_png.c	2010-02-08 12:27:51.000000000 +0300
-+++ libharu-2.2.1.my/src/hpdf_image_png.c	2012-01-23 12:53:05.000000000 +0400
-@@ -110,13 +110,13 @@
- {
-     png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
-     png_bytep* row_pointers = HPDF_GetMem (image->mmgr,
--                info_ptr->height * sizeof (png_bytep));
-+                png_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
- 
-     if (row_pointers) {
-         HPDF_UINT i;
- 
--        HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep));
--        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+        HPDF_MemSet (row_pointers, 0, png_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
-+        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-             row_pointers[i] = HPDF_GetMem (image->mmgr, len);
- 
-             if (image->error->error_no != HPDF_OK)
-@@ -126,7 +126,7 @@
-         if (image->error->error_no == HPDF_OK) {
-             png_read_image(png_ptr, row_pointers);
-             if (image->error->error_no == HPDF_OK) {       /* add this line */
--                for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+                for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-                     if (HPDF_Stream_Write (image->stream, row_pointers[i], len) !=
-                             HPDF_OK)
-                         break;
-@@ -135,7 +135,7 @@
-         }
- 
-         /* clean up */
--        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-             HPDF_FreeMem (image->mmgr, row_pointers[i]);
-         }
- 
-@@ -156,7 +156,7 @@
-     if (buf_ptr) {
-         HPDF_UINT i;
- 
--        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-             png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1);
-             if (image->error->error_no != HPDF_OK)
-                 break;
-@@ -183,13 +183,13 @@
- 	HPDF_UINT i, j;
- 	png_bytep *row_ptr;
- 
--	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
-+	row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
- 	if (!row_ptr) {
- 		return HPDF_FAILD_TO_ALLOC_MEM;
- 	} else {
- 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
- 
--		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+		for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
- 			if (!row_ptr[i]) {
- 				for (; i >= 0; i--) {
-@@ -207,19 +207,19 @@
- 		goto Error;
- 	}
- 
--	for (j = 0; j < info_ptr->height; j++) {
--		for (i = 0; i < info_ptr->width; i++) {
--			smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
-+	for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
-+		for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
-+			smask_data[png_image_width(png_ptr, info_ptr) * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
- 		}
- 
--		if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) {
-+		if (HPDF_Stream_Write (image->stream, row_ptr[j], png_image_width(png_ptr, info_ptr)) != HPDF_OK) {
- 			ret = HPDF_FILE_IO_ERROR;
- 			goto Error;
- 		}
- 	}
- 
- Error:
--	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+	for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
- 	}
- 
-@@ -245,13 +245,13 @@
- 		return HPDF_INVALID_PNG_IMAGE;
- 	}
- 
--	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
-+	row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
- 	if (!row_ptr) {
- 		return HPDF_FAILD_TO_ALLOC_MEM;
- 	} else {
- 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
- 
--		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+		for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
- 			if (!row_ptr[i]) {
- 				for (; i >= 0; i--) {
-@@ -271,12 +271,12 @@
- 
- 	switch (color_type) {
- 		case PNG_COLOR_TYPE_RGB_ALPHA:
--			row_len = 3 * info_ptr->width * sizeof(png_byte);
--			for (j = 0; j < info_ptr->height; j++) {
--				for (i = 0; i < info_ptr->width; i++) {
-+			row_len = 3 * png_image_width(png_ptr, info_ptr) * sizeof(png_byte);
-+			for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
-+				for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
- 					row = row_ptr[j];
- 					memmove(row + (3 * i), row + (4*i), 3);
--					smask_data[info_ptr->width * j + i] = row[4 * i + 3];
-+					smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[4 * i + 3];
- 				}
- 
- 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
-@@ -286,12 +286,12 @@
- 			}
- 			break;
- 		case PNG_COLOR_TYPE_GRAY_ALPHA:
--			row_len = info_ptr->width * sizeof(png_byte);
--			for (j = 0; j < info_ptr->height; j++) {
--				for (i = 0; i < info_ptr->width; i++) {
-+			row_len = png_image_width(png_ptr, info_ptr) * sizeof(png_byte);
-+			for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
-+				for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
- 					row = row_ptr[j];
- 					row[i] = row[2 * i];
--					smask_data[info_ptr->width * j + i] = row[2 * i + 1];
-+					smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[2 * i + 1];
- 				}
- 
- 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
-@@ -306,7 +306,7 @@
- 	}
- 
- Error:
--	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+	for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
- 	}
- 
-@@ -448,7 +448,7 @@
- 	}
- 
- 	/* 16bit images are not supported. */
--	if (info_ptr->bit_depth == 16) {
-+	if (png_get_bit_depth(png_ptr, info_ptr) == 16) {
- 		png_set_strip_16(png_ptr);
- 	}
- 
-@@ -458,7 +458,7 @@
- 	}
- 
- 	/* check palette-based images for transparent areas and load them immediately if found */
--	if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) {
-+	if (xref && PNG_COLOR_TYPE_PALETTE & png_get_color_type(png_ptr, info_ptr)) {
- 		png_bytep trans;
- 		int num_trans;
- 		HPDF_Dict smask;
-@@ -478,10 +478,10 @@
- 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
- 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
- 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
--		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
-+		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
- 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
--		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 
- 		if (ret != HPDF_OK) {
- 			HPDF_Dict_Free(smask);
-@@ -489,7 +489,7 @@
- 			goto Exit;
- 		}
- 
--		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
-+		smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr));
- 		if (!smask_data) {
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FAILD_TO_ALLOC_MEM;
-@@ -503,7 +503,7 @@
- 			goto Exit;
- 		}
- 
--		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
-+		if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) {
- 			HPDF_FreeMem(image->mmgr, smask_data);
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FILE_IO_ERROR;
-@@ -513,9 +513,9 @@
- 
- 
- 		ret += CreatePallet(image, png_ptr, info_ptr);
--		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
--		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 		ret += HPDF_Dict_Add (image, "SMask", smask);
- 
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -526,7 +526,7 @@
- 
- 	/* read images with alpha channel right away 
- 	   we have to do this because image transparent mask must be added to the Xref */
--	if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) {
-+	if (xref && PNG_COLOR_MASK_ALPHA & png_get_color_type(png_ptr, info_ptr)) {
- 		HPDF_Dict smask;
- 		png_bytep smask_data;
- 
-@@ -539,10 +539,10 @@
- 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
- 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
- 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
--		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
-+		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
- 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
--		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 
- 		if (ret != HPDF_OK) {
- 			HPDF_Dict_Free(smask);
-@@ -550,7 +550,7 @@
- 			goto Exit;
- 		}
- 
--		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
-+		smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr));
- 		if (!smask_data) {
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FAILD_TO_ALLOC_MEM;
-@@ -564,7 +564,7 @@
- 			goto Exit;
- 		}
- 
--		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
-+		if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) {
- 			HPDF_FreeMem(image->mmgr, smask_data);
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FILE_IO_ERROR;
-@@ -572,14 +572,14 @@
- 		}
- 		HPDF_FreeMem(image->mmgr, smask_data);
- 
--		if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-+		if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) {
- 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
- 		} else {
- 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
- 		}
--		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
--		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 		ret += HPDF_Dict_Add (image, "SMask", smask);
- 
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -589,9 +589,9 @@
- 	/* if the image has color palette, copy the pallet of the image to
- 	 * create color map.
- 	 */
--	if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
- 		ret = CreatePallet(image, png_ptr, info_ptr);
--	else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+	else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
- 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
- 	else
- 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
-@@ -617,16 +617,16 @@
- 	}
- 
- 	/* setting the info of the image. */
--	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width)
-+	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr))
- 			!= HPDF_OK)
- 		goto Exit;
- 
--	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height)
-+	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr))
- 			!= HPDF_OK)
- 		goto Exit;
- 
- 	if (HPDF_Dict_AddNumber (image, "BitsPerComponent",
--				(HPDF_UINT)info_ptr->bit_depth) != HPDF_OK)
-+				(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)) != HPDF_OK)
- 		goto Exit;
- 
- 	/* clean up */
diff --git a/community-staging/libinfinity/PKGBUILD b/community-staging/libinfinity/PKGBUILD
deleted file mode 100644
index f74a2ed82..000000000
--- a/community-staging/libinfinity/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62402 2012-01-19 19:43:12Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Gregory Haynes <greg@greghaynes.net>
-
-pkgname=libinfinity
-pkgver=0.5.1
-pkgrel=3
-pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
-arch=('i686' 'x86_64')
-url="http://gobby.0x539.de"
-license=('GPL')
-depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
-makedepends=('gtk-doc' 'pkgconfig')
-optdepends=('avahi: zeroconf support'
-            'gtk2: gtk support')
-options=('!libtool')
-source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('85e6d75e101fe25503653d2202054eff')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --localstatedir=/var
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  rm -rf $pkgdir/var
-}
diff --git a/community-staging/libmatchbox/PKGBUILD b/community-staging/libmatchbox/PKGBUILD
deleted file mode 100644
index e5fe9b49f..000000000
--- a/community-staging/libmatchbox/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 62375 2012-01-19 18:03:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
-
-pkgname=libmatchbox
-pkgver=1.9
-pkgrel=5
-pkgdesc="Base library for Matchbox WM"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext')
-options=('!libtool')
-url="http://matchbox-project.org/"
-source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-	libpng15.patch)
-md5sums=('9f73e7515cc4679171a5db180dc1343b'
-         '09f782c76fe313efd0e87fabb276e2fe')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c
-  patch -Rp1 <$srcdir/libpng15.patch
-  LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/libmatchbox/libpng15.patch b/community-staging/libmatchbox/libpng15.patch
deleted file mode 100644
index 6c4ddef4d..000000000
--- a/community-staging/libmatchbox/libpng15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -wbBur libmatchbox-1.9/libmb/mbpixbuf.c libmatchbox-1.9.org/libmb/mbpixbuf.c
---- libmatchbox-1.9/libmb/mbpixbuf.c	2012-01-19 21:57:56.000000000 +0400
-+++ libmatchbox-1.9.org/libmb/mbpixbuf.c	2006-07-26 23:12:25.000000000 +0400
-@@ -247,7 +247,7 @@
-     return NULL;
-   }
- 
--  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
-+  if ( setjmp( png_ptr->jmpbuf ) ) {
-     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
-     fclose(fd);
-     return NULL;
-@@ -269,8 +269,8 @@
-       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
-     png_set_gray_to_rgb(png_ptr);
-  
--  if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA 
--       || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA
-+  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
-+       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
-        )
-     *has_alpha = 1;
-   else
diff --git a/community-staging/librcc/PKGBUILD b/community-staging/librcc/PKGBUILD
deleted file mode 100644
index 5fe6879d7..000000000
--- a/community-staging/librcc/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 61463 2011-12-31 21:14:57Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=librcc
-pkgver=0.2.6
-pkgrel=5
-pkgdesc="Charset Conversion Library"
-arch=(i686 x86_64)
-url="http://rusxmms.sourceforge.net/"
-license=('GPL')
-depends=(aspell enca libxml2 db librcd)
-makedepends=(patch gtk gtk2)
-install=librcc.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2
-        librcc-strnlen.patch)
-md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1'
-         '040313d1d8f166ccf2b128cea4c05f21')
-
-build() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  ./configure --prefix=/usr
-  patch -p1 <$srcdir/librcc-strnlen.patch
-  make
-}
-
-package() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  mkdir -p $startdir/pkg/etc/rcc
-  mkdir -p $startdir/pkg/usr/lib/rcc/engines
-  mkdir -p $startdir/pkg/usr/bin
-
-  make DESTDIR=$startdir/pkg install
-
-  make -C examples
-  make -C examples install DESTDIR=$startdir/pkg
-  rm -f $startdir/pkg/usr/bin/example*
-
-  install -m 644 examples/rcc.xml $startdir/pkg/etc
-
-  if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then
-      ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config
-  elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then
-      ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config
-  else
-      echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config
-      echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config
-  fi
-}
diff --git a/community-staging/librcc/librcc-strnlen.patch b/community-staging/librcc/librcc-strnlen.patch
deleted file mode 100644
index 9fc0e8b0b..000000000
--- a/community-staging/librcc/librcc-strnlen.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h
---- librcc-0.2.6/src/rccstring.h	2006-01-08 15:42:59.000000000 +0000
-+++ librcc-0.2.6.qwe/src/rccstring.h	2009-09-28 08:45:37.000000000 +0000
-@@ -18,13 +18,6 @@
- int rccStringFixID(rcc_string string, rcc_context ctx);
- int rccStringChangeID(rcc_string string, rcc_language_id language_id);
- 
--#ifdef HAVE_STRNLEN
--# ifndef strnlen
--int strnlen(const char *str, size_t size);
--# endif /* !strnlen */
--#else
--int rccStrnlen(const char *str, size_t size);
--#endif /* HAVE_STRNLEN */
- int rccIsASCII(const char *str);
- size_t rccStringSizedGetChars(const char *str, size_t size);
- 
diff --git a/community-staging/librcc/librcc.install b/community-staging/librcc/librcc.install
deleted file mode 100644
index 53b1d7ce7..000000000
--- a/community-staging/librcc/librcc.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc"
-  echo "   gui features"
-  echo "-- Also you may change /usr/bin/rcc-config symlink to switch between"
-  echo "   gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)"
-}
diff --git a/community-staging/luakit/PKGBUILD b/community-staging/luakit/PKGBUILD
deleted file mode 100644
index e92f5a99f..000000000
--- a/community-staging/luakit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
-
-pkgname=luakit
-pkgver=2011.07.22
-pkgrel=3
-pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.'
-arch=('i686' 'x86_64')
-url='http://www.luakit.org/projects/luakit'
-license=('GPL3')
-depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils')
-makedepends=('git' 'help2man')
-options=(!makeflags)
-conflicts=('luakit-git' 'luakit-develop-git')
-install='luakit.install'
-source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1")
-md5sums=('4937deb6bc81416e2deb037f4a5763e4')
-
-build() {
-  cd mason-larobina-luakit-*
-
-  # Add missing library to PKGS in config.mk
-  sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk
-
-  make PREFIX=/usr DESTDIR=${pkgdir} all
-}
-
-package() {
-  cd mason-larobina-luakit-*
-
-  make PREFIX=/usr DESTDIR=${pkgdir} install 
-}
diff --git a/community-staging/luakit/luakit.install b/community-staging/luakit/luakit.install
deleted file mode 100644
index 2c37d0597..000000000
--- a/community-staging/luakit/luakit.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo 'Configs are located in /etc/xdg/luakit/*.lua'
-  echo 'Copy to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.'
-  echo 'Or edit in place for global changes.'
-  echo 'You NEED to replace local configs after each update'
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  post_upgrade
-}
diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
deleted file mode 100644
index c9cc4e4ab..000000000
--- a/community-staging/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 62810 2012-01-27 07:16:32Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=7
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz
-        luminance-hdr-2.1.0-libraw.patch)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac'
-            'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c')
-
-build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  # stolen from gentoo
-  patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch
-
-  if [ ${CARCH} = i686 ]; then
-    sed -i 's/ -msse2//' project.pro
-  fi
-
-  lrelease project.pro
-  qmake PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch
deleted file mode 100644
index 8472a7422..000000000
--- a/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
-+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
-@@ -94,7 +94,6 @@
-   RawProcessor.set_progress_handler(cb, callback_data);
-   int ret;
- 
--  OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
-   OUT.output_bps = 16;
- 
-   //OUT.gamm[0] = 1/2.4;   //sRGB
diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 807541292..000000000
--- a/community-staging/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,36 +0,0 @@
-2012-01-27  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package renamed to LuminanceHDR
-	* Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
-	* exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
-	* add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-staging/luminancehdr/luminancehdr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD
deleted file mode 100644
index 7bbc73649..000000000
--- a/community-staging/luxrender/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 62835 2012-01-27 16:09:08Z 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=12
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
-            'python: Python interface (pylux)'
-            'nvidia-utils: OpenCL support for nVidia GPUs' \
-            'amdstream: OpenCL support for AMD GPUs' \
-            'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers')
-source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
-md5sums=('0f2d856385db72131f51e44a7ee527fa')
-
-build() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-
-  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD
deleted file mode 100644
index 815ffd88f..000000000
--- a/community-staging/mapnik/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 62650 2012-01-23 09:28:07Z 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=13
-pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
-arch=('i686' 'x86_64')
-url="http://mapnik.org/"
-license=('LGPL')
-depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
-	 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
-	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
-	# already in core ('zlib' 'sqlite3')
-optdepends=('libxslt:         Web Map Service'
-            'python-lxml:     Web Map Service'
-            'python-imaging:  Web Map Service'
-            'python-nose:     Web Map Service'
-            'apache:          Web Map Service'
-            'mod_fastcgi:     Web Map Service - or:'
-            'mod_fcgid:       Web Map Service - or:'
-            'mod_wsgi:        Web Map Service'
-           )
-makedepends=('scons' 'boost') # already in core ('pkg-config')
-conflicts=('mapnik-svn')
-install="mapnik.install"
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8f65fda2a792518d6f6be8a85f62fc73')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64
-  sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct
-  sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp
-  sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct
-
-  scons configure \
-    PREFIX="/usr" \
-    INPUT_PLUGINS=all \
-    DESTDIR="$pkgdir"
-  scons
-}
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  scons install
-  # fix permissions on SCons-autogenerated files
-  chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py"
-}
diff --git a/community-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/megaglest/PKGBUILD b/community-staging/megaglest/PKGBUILD
deleted file mode 100644
index fda998a3c..000000000
--- a/community-staging/megaglest/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 62444 2012-01-20 06:40:44Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
- 
-pkgname=megaglest
-pkgver=3.6.0.2
-pkgrel=2
-pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/megaglest/"
-license=('GPL3')
-depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew'
-         'libircclient' 'miniupnpc' 'wxgtk')
-makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('9d840a04b41aef2cba503de7bf433b8d')
-
-build() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake .. \
-   -DWANT_SVN_STAMP=OFF \
- 	 -DCMAKE_INSTALL_PREFIX=/usr \
-   -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-  make
-}
-
-package() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  cd build
-  make DESTDIR="$pkgdir" install
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/megaglest/megaglest.sh b/community-staging/megaglest/megaglest.sh
deleted file mode 100644
index 571a01be7..000000000
--- a/community-staging/megaglest/megaglest.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
- # Wrapper script for Megaglest.
- 
- MAINDIR=/usr/share/megaglest
- BASEDIR="$HOME/.config"
- DIR="$BASEDIR/megaglest"
- if [ ! -d "$DIR" ]; then
- mkdir -p $DIR
- fi
- cd $DIR
- [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini .
- [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest .
- [ -f servers.ini ] || cp $MAINDIR/servers.ini .
- [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini .
- for i in data scenarios techs tilesets tutorials; do
- [ -h $i ] || ln -s $MAINDIR/$i .
- done
- [ -d maps ] || mkdir maps
- [ -d screens ] || mkdir screens
- cd maps
- for i in $MAINDIR/maps/*; do
- [ -h `basename $i` ] || ln -s $i .
- done
- cd ..
- 
- exec ./megaglest
\ No newline at end of file
diff --git a/community-staging/metapixel/PKGBUILD b/community-staging/metapixel/PKGBUILD
deleted file mode 100644
index 7767059ee..000000000
--- a/community-staging/metapixel/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 62646 2012-01-23 04:17:52Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
-
-pkgname=metapixel
-pkgver=1.0.2
-pkgrel=3
-pkgdesc='A program for generating photomosaics.'
-arch=('i686' 'x86_64')
-url='http://www.complang.tuwien.ac.at/schani/metapixel/'
-license=('GPL')
-depends=('giflib' 'libjpeg' 'libpng' 'perl')
-source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz"
-        'metapixel-1.0.2-libpng-1.5.patch')
-md5sums=('af5d77d38826756af213a08e3ada9941'
-         '1832a79790b07402735bfeb9f71f36e9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  install -dm0755 "${pkgdir}/usr/share/man/man1"
-
-  make PREFIX="${pkgdir}/usr" install
-}
diff --git a/community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch
deleted file mode 100644
index ed787452f..000000000
--- a/community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- metapixel-1.0.2.orig/rwimg/rwpng.c
-+++ metapixel-1.0.2/rwimg/rwpng.c
-@@ -57,19 +57,39 @@
-     data->end_info = png_create_info_struct(data->png_ptr);
-     assert(data->end_info != 0);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
--    png_init_io(data->png_ptr, data->file);
--
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	png_init_io(data->png_ptr, data->file);
-+    png_read_info(data->png_ptr, data->info_ptr);
-+#else
-+	png_init_io(data->png_ptr, data->file);
-     png_read_info(data->png_ptr, data->info_ptr);
-+#endif
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	*width = png_get_image_width(data->png_ptr, data->info_ptr);
-+	*height = png_get_image_height(data->png_ptr, data->info_ptr);
-+	{
-+		png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr);
-+    	assert(value == 8 || value == 16);
-+		value = png_get_color_type(data->png_ptr, data->info_ptr);
-+    	assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA);
-+    	value = png_get_interlace_type(data->png_ptr, data->info_ptr);
-+    	assert(value == PNG_INTERLACE_NONE);
-+	}
-+#else
-     *width = data->info_ptr->width;
-     *height = data->info_ptr->height;
--
-     assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16);
-     assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
-     assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE);
-+#endif
- 
-     data->have_read = 0;
- 
-@@ -81,32 +101,51 @@
- {
-     png_data_t *data = (png_data_t*)_data;
-     int i;
--    int bps, spp;
-+    int bps, spp, width;
-     unsigned char *row;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
-+#else
-     if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+#endif
- 	spp = 3;
-     else
- 	spp = 4;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
-+#else
-     if (data->info_ptr->bit_depth == 16)
-+#endif
- 	bps = 2;
-     else
- 	bps = 1;
- 
--    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	width = png_get_image_width(data->png_ptr, data->info_ptr);
-+#else
-+    width = data->info_ptr->width:
-+#endif
-+
-+    row = (unsigned char*)malloc(width * spp * bps);
- 
-     for (i = 0; i < num_lines; ++i)
-     {
- 	int j, channel;
- 
- 	png_read_row(data->png_ptr, (png_bytep)row, 0);
--	for (j = 0; j < data->info_ptr->width; ++j)
-+	for (j = 0; j < width; ++j)
- 	    for (channel = 0; channel < 3; ++channel)
--		lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
-+		lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
-     }
- 
-     free(row);
-@@ -119,7 +158,11 @@
- {
-     png_data_t *data = (png_data_t*)_data;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     if (data->have_read)
-@@ -148,7 +191,11 @@
-     data->info_ptr = png_create_info_struct(data->png_ptr);
-     assert(data->info_ptr != 0);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     if (pixel_stride == 4)
-@@ -156,6 +203,16 @@
- 
-     png_init_io(data->png_ptr, data->file);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	png_set_IHDR(data->png_ptr, data->info_ptr,
-+		width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-+		PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-+
-+	/* Maybe does not need following. */
-+	png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL);
-+	png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0);
-+	png_set_invalid(data->png_ptr, data->info_ptr, 0);
-+#else
-     data->info_ptr->width = width;
-     data->info_ptr->height = height;
-     data->info_ptr->valid = 0;
-@@ -168,6 +225,7 @@
-     data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
-     data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
-     data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+#endif
- 
-     png_write_info(data->png_ptr, data->info_ptr);
- 
-@@ -182,7 +240,11 @@
-     png_data_t *data = (png_data_t*)_data;
-     int i;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     for (i = 0; i < num_lines; ++i)
-@@ -194,7 +256,11 @@
- {
-     png_data_t *data = (png_data_t*)_data;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     png_write_end(data->png_ptr, data->info_ptr);
diff --git a/community-staging/mldonkey/PKGBUILD b/community-staging/mldonkey/PKGBUILD
deleted file mode 100644
index 88cc8860d..000000000
--- a/community-staging/mldonkey/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 62876 2012-01-28 13:55:36Z cbrannon $
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
-
-pkgname=mldonkey
-pkgver=3.1.0
-pkgrel=2
-pkgdesc="A multi-network P2P client"
-arch=('i686' 'x86_64')
-url="http://mldonkey.sourceforge.net/"
-license=('GPL')
-depends=('desktop-file-utils' 'file' 'gd' 'bzip2')
-makedepends=('lablgtk2' 'librsvg' 'ocaml')
-optdepends=('librsvg: GUI support'
-            'libx11: GUI support')
-backup=('etc/conf.d/mldonkey')
-install=mldonkey.install
-source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
-        mldonkeyd
-        mldonkey.conf
-        mldonkey.desktop)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --enable-gui=newgui2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \
-    "$pkgdir/usr/share/icons/mldonkey.svg"
-  install -Dm644 "$srcdir/mldonkey.desktop" \
-    "$pkgdir/usr/share/applications/mldonkey.desktop"
-
-  install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey"
-  install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey"
-}
-md5sums=('072726d158ba1e936c554be341e7ceff'
-         '75e4b6c7fb282f7de15a8d5478f3bd70'
-         '1f86d92db51c62cded0e6f3833057dee'
-         '1de3266caa49f82bee73ba891eea12cf')
diff --git a/community-staging/mldonkey/mldonkey.conf b/community-staging/mldonkey/mldonkey.conf
deleted file mode 100644
index 24a25af74..000000000
--- a/community-staging/mldonkey/mldonkey.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Username under which the daemon will run (mandatory)
-MLDUSER=""
-
-# Parameters to be passed to the daemon (default is empty)
-PARAMS=""
diff --git a/community-staging/mldonkey/mldonkey.desktop b/community-staging/mldonkey/mldonkey.desktop
deleted file mode 100644
index b307261e1..000000000
--- a/community-staging/mldonkey/mldonkey.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MLDonkey GUI
-Comment=multi-protocol P2P program
-Exec=mldonkey_gui
-Icon=mldonkey
-Terminal=false
-Type=Application
-Categories=Network;P2P;
diff --git a/community-staging/mldonkey/mldonkey.install b/community-staging/mldonkey/mldonkey.install
deleted file mode 100644
index dd8ea0407..000000000
--- a/community-staging/mldonkey/mldonkey.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  if [ -f /etc/mldonkey.conf ]; then
-    mv /etc/mldonkey.conf /etc/conf.d/mldonkey
-    cat << EOM
-
-==> mldonkey post upgrade message:
-==> /etc/mldonkey.conf has been moved in /etc/conf.d/mldonkey
-
-EOM
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/mldonkey/mldonkeyd b/community-staging/mldonkey/mldonkeyd
deleted file mode 100644
index 6a458d68e..000000000
--- a/community-staging/mldonkey/mldonkeyd
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/mldonkey
-. /etc/rc.d/functions
-
-if [ -z $MLDUSER ] ; then
-	echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ."
-	exit 2
-fi
-
-if [ -z "$(getent passwd "$MLDUSER")" ]; then
-	# Perhaps we should create the account for the user?
-	echo "You must create the account $MLDUSER in order to run mldonkey."
-	echo "Please create the account manually, and try again."
-	exit 2
-fi
-
-MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4)
-MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1)
-USERDIR=$(getent passwd $MLDUSER | cut -d: -f6)
-
-if [ ! -d $USERDIR ]; then
-	echo "Unable to run MLDonkey. Home directory for ${MLDUSER} does not exist."
-	exit 2
-fi
-
-PIDDIR="/var/run/mldonkey"
-PIDFILE="$PIDDIR/mlnet.pid"
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-    	start)
-        	stat_busy "Starting MLDonkey"
-		if [ ! -d $PIDDIR ]; then
-			install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR
-		fi
-		if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then
-			chown -R "$MLDUSER:$MLDGROUP" $PIDDIR
-		fi
-		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR  $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon mldonkey
-			stat_done
-		fi
-	;;
-    	stop)
-        	stat_busy "Stopping MLDonkey"
-		[ ! -z $PID ] && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon mldonkey
-			stat_done
-		fi
-	;;
-    	restart)
-        	$0 stop
-		sleep 1
-        	$0 start
-        ;;
-    	*)
-        	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD
deleted file mode 100644
index d20095a97..000000000
--- a/community-staging/mtpaint/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63383 2012-01-31 23:43:55Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=2
-pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
-arch=('x86_64' 'i686')
-url="http://mtpaint.sourceforge.net/"
-license=('GPL3')
-depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2')
-install=mtpaint.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "libpng15.patch")
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
-            'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	patch -Np1 -i "$srcdir/libpng15.patch"
-	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
-  sed -i 's:-lpng:-lpng -lgif:' _conf.txt
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/community-staging/mtpaint/libpng15.patch b/community-staging/mtpaint/libpng15.patch
deleted file mode 100644
index 7df3b2127..000000000
--- a/community-staging/mtpaint/libpng15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
---- mtpaint-3.31.orig/src/png.c	2010-01-25 00:43:07.000000000 +0200
-+++ mtpaint-3.31/src/png.c	2010-01-25 00:43:39.000000000 +0200
-@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
- 	if (settings->bpp == 3)
- 	{
- 		png_set_strip_16(png_ptr);
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		png_set_palette_to_rgb(png_ptr);
- 		png_set_gray_to_rgb(png_ptr);
- 
-@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
- 		png_set_strip_alpha(png_ptr);
- 		png_set_packing(png_ptr);
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		for (i = 0; i < height; i++)
- 		{
- 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
diff --git a/community-staging/mtpaint/mtpaint.install b/community-staging/mtpaint/mtpaint.install
deleted file mode 100644
index 99a538dea..000000000
--- a/community-staging/mtpaint/mtpaint.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-	update-desktop-database -q
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/mypaint/PKGBUILD b/community-staging/mypaint/PKGBUILD
deleted file mode 100644
index 5fc81ca34..000000000
--- a/community-staging/mypaint/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 62404 2012-01-19 19:47:12Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jon Nordby <jononor@gmail.com>
-
-pkgname=mypaint
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="A fast and easy painting application for digital painters, with brush dynamics"
-arch=('i686' 'x86_64')
-url="http://mypaint.intilinux.com/"
-license=('GPL' 'LGPL')
-depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2')
-makedepends=('scons>=0.97' 'swig>=1.3.39')
-install=mypaint.install
-source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('dcd43933746a4579e7994f506e097823')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # python2 fix
-  sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-  scons
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  scons prefix="$pkgdir"/usr install
-}
diff --git a/community-staging/mypaint/mypaint.install b/community-staging/mypaint/mypaint.install
deleted file mode 100644
index 5f0358791..000000000
--- a/community-staging/mypaint/mypaint.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
-	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	/bin/true
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-post_remove() {
-	post_install $1
-}
diff --git a/community-staging/naev/PKGBUILD b/community-staging/naev/PKGBUILD
deleted file mode 100644
index 477dfb137..000000000
--- a/community-staging/naev/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 62441 2012-01-20 06:29:53Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Johan Rehnberg <cleanrock@gmail.com>
-
-pkgname=naev
-pkgver=0.5.0
-pkgrel=2
-pkgdesc='2D action/rpg space game'
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/naev/"
-license=('GPL3')
-depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data')
-makedepends=('freeglut')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f7d754a17ace87aac540d0d6d48313d6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i "41 i #include <zlib.h>" src/opengl.c
-
-  ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${pkgver}
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-staging/nestopia/ChangeLog b/community-staging/nestopia/ChangeLog
deleted file mode 100644
index 5077d00b2..000000000
--- a/community-staging/nestopia/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2008-12-16  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD: Minor corrections.
-
-2008-12-04  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD (source): Package adopted.
-	Variable/version cleanup.
-	Patch to remove bogus error messages on program exit.
-	New dependency: mesa.
-	Renamed executable to nestopia.
-
diff --git a/community-staging/nestopia/PKGBUILD b/community-staging/nestopia/PKGBUILD
deleted file mode 100644
index 0c3429e04..000000000
--- a/community-staging/nestopia/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 62377 2012-01-19 18:15:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
-# Contributor: robb_force <robb_force@holybuffalo.net>
-
-pkgname=nestopia
-pkgver=1.40h
-pkgrel=5
-pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
-url='http://rbelmont.mameworld.info/?page_id=200'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa')
-makedepends=('unzip')
-# rbelmont.mameworld.info blocks some user-agents
-DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u'
-	  'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
-source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip"
-	"http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip"
-	"nestopia"
-	"nestopia_bogus_error_on_save_settings.patch")
-md5sums=('526c99a06d2b257135e7047b0ed95ae0'
-         'f9a9a905bada67e11dac1364612d0b35'
-         'abc2f030dd291f58d65c9095ef024225'
-         '0160078c9afcbb1a6ac389c3989929f7')
-
-build() {
-  cd ${srcdir}
-  # remove a bogus error message on exit
-  patch -p0 < nestopia_bogus_error_on_save_settings.patch
-  make -j1
-
-  # Install the nestopia script that copies required files to ~/.nestopia
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-
-  # Older releases used a .sh file. Make a symlink to make everyone happy
-  cd ${pkgdir}/usr/bin
-  ln -s ${pkgname} ${pkgname}.sh
-
-  # Install the required files and executable in /usr/share
-  cd ${srcdir}
-  install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin
-  install -dm775 ${pkgdir}/usr/share/${pkgname}/
-  install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/
-  install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/
-}
diff --git a/community-staging/nestopia/nestopia b/community-staging/nestopia/nestopia
deleted file mode 100644
index 52bd2b2b3..000000000
--- a/community-staging/nestopia/nestopia
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ ! -e $HOME/.nestopia ]; then
-  echo "Running NEStopia for the first time..."
-  echo "Copying required files to ~/.nestopia..."
-  mkdir $HOME/.nestopia
-  cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/
-fi
-
-nestopia-bin "$@"
diff --git a/community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch b/community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch
deleted file mode 100644
index 63f33bc72..000000000
--- a/community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/linux/settings.cpp.old	2008-10-23 05:45:58.000000000 +0200
-+++ source/linux/settings.cpp	2008-12-04 23:17:59.000000000 +0100
-@@ -16,7 +16,7 @@
- using namespace LinuxNst;
- 
- #define READ_SETTING(x) fread(&x, sizeof(x), 1, f)
--#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n"
-+#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n"
- 
- static int rates[4] = { 11025, 22050, 44100, 48000 };
- 
diff --git a/community-staging/netsurf/PKGBUILD b/community-staging/netsurf/PKGBUILD
deleted file mode 100644
index b43fdcdfb..000000000
--- a/community-staging/netsurf/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 62700 2012-01-24 21:17:57Z 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')
-makedepends=('re2c' 'lcms')
-provides=('netsurf')
-conflicts=('netsurf')
-install=netsurf.install
-source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz"
-        "$pkgname.desktop")
-md5sums=('4f28912e5df4b826b819e175265bcc9c'
-         '49c41f281f3e9ca28a24da505fad2e3a'
-         '85e0af265e77607596fd90db9ac707ad')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  sed 's:libpng:libpng15:' -i gtk/Makefile.target
-  sed 's:libpng:libpng15:' -i monkey/Makefile.target
-  make PREFIX=/usr TARGET=gtk
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  make install PREFIX=/usr DESTDIR="$pkgdir"
-  install -Dm644 "../$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "../$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/netsurf/PKGBUILD.wip b/community-staging/netsurf/PKGBUILD.wip
deleted file mode 100644
index 592ca0268..000000000
--- a/community-staging/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-staging/netsurf/netsurf.desktop b/community-staging/netsurf/netsurf.desktop
deleted file mode 100644
index aca4deefc..000000000
--- a/community-staging/netsurf/netsurf.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Netsurf
-Name[ar]=صافي تصفح
-Name[ast]=Netsurf
-Name[ca]=Netsurf
-Name[cs]=Netsurf
-Name[da]=Netsurf
-Name[de]=Netsurf
-Name[el]=καθαρού σερφ
-Name[en_GB]=Netsurf
-Name[es]=Netsurf
-Name[et]=Netsurf
-Name[fi]=Netsurf
-Name[fr]=Netsurf
-Name[gl]=Netsurf
-Name[he]=Netsurf
-Name[hr]=Netsurf
-Name[hu]=Netsurf
-Name[id]=Netsurf
-Name[it]=Netsurf
-Name[ja]=Netsurf
-Name[ko]=인터넷 서핑
-Name[lt]=Netsurf
-Name[nl]=Netsurf
-Name[no]=Netsurf
-Name[pl]=Netsurf
-Name[pt]=Netsurf
-Name[pt_BR]=Netsurf
-Name[ro]=Netsurf
-Name[ru]=Netsurf
-Name[sk]=Netsurf
-Name[sr]=нетсурф
-Name[sr@latin]=Netsurf
-Name[sv]=Netsurf
-Name[tr]=Netsurf
-Name[ug]=Netsurf
-Name[uk]=Інтернет серфінгу
-Name[zh_CN]=Netsurf 网冲浪
-Name[zh_TW]=Netsurf 網衝浪
-GenericName=Web Browser
-GenericName[ar]=متصفح الوب
-GenericName[ast]=Restolador
-GenericName[ca]=Navegador web
-GenericName[cs]=Internetový prohlížeč
-GenericName[da]=Webbrowser
-GenericName[de]=Internetbetrachter
-GenericName[el]=Περιηγητής Ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=Verkkoselain
-GenericName[fr]=Navigateur Internet
-GenericName[gl]=Navegador web
-GenericName[he]=דפדפן
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[id]=Peramban Web
-GenericName[it]=Browser web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Interneto naršyklė
-GenericName[nl]=Webbrowser
-GenericName[no]=Nettleser
-GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-GenericName[pl]=Przeglądarka internetowa
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador web
-GenericName[ro]=Navigator web
-GenericName[ru]=Интернет-обозреватель
-GenericName[sk]=Internetový prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[sr@latin]=Internet preglednik
-GenericName[sv]=Webbläsare
-GenericName[tr]=Web Tarayıcı
-GenericName[ug]=توركۆرگۈ
-GenericName[uk]=Переглядач Веб
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-Comment=Lightweight web browser
-Comment[ar]=منصفح الوب الخفيف
-Comment[ast]=Restolador llixeru
-Comment[ca]=Navegador web lleuger
-Comment[cs]=Odlehčený prohlížeč
-Comment[da]=Letvægtig webbrowser
-Comment[de]=Schlanker Internetbetrachter
-Comment[el]=Ελαφρύς περιηγητής ιστού
-Comment[en_GB]=Lightweight web browser
-Comment[es]=Navegador web ligero
-Comment[et]=Kergekaaluline veebibrauser
-Comment[fi]=Kevyt verkkoselain
-Comment[fr]=Navigateur Internet léger
-Comment[gl]=Navegador web lixeiro
-Comment[he]=דפדפן קל משקל
-Comment[hr]=Lagani web preglednik
-Comment[hu]=Könnyűsúlyú webböngésző
-Comment[id]=Peramban web ringan
-Comment[it]=Browser web leggero
-Comment[ja]=軽量級ウェブブラウザ
-Comment[ko]=가벼운 웹 브라우저
-Comment[lt]=Paprasta interneto naršyklė
-Comment[nl]=Lichtgewicht webbrowser
-Comment[no]=Lettvektig nettleser
-Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej
-Comment[pt]=Navegador Web rápido
-Comment[pt_BR]=Navegador web leve
-Comment[ro]=Mic navigator web
-Comment[ru]=Легковесный Интернет-обозреватель
-Comment[sk]=Ľahký internetový prehliadač
-Comment[sr]=Једноставан Интернет прегледник
-Comment[sr@latin]=Jednostavan Internet preglednik
-Comment[sv]=Resurssnål webbläsare
-Comment[tr]=Hafif web tarayıcı 
-Comment[ug]=يېنىك توركۆرگۈ
-Comment[uk]=Легкий переглядач Веб
-Comment[zh_CN]=轻量级网页浏览器
-Comment[zh_TW]=輕量級網頁瀏覽器
-Categories=GTK;Network;WebBrowser;
-MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
-Exec=netsurf %U
-Icon=netsurf
-Terminal=false
-StartupNotify=true
-X-Osso-Type=application/x-executable
-X-Osso-Service=netsurf
diff --git a/community-staging/netsurf/netsurf.install b/community-staging/netsurf/netsurf.install
deleted file mode 100644
index 966f361ea..000000000
--- a/community-staging/netsurf/netsurf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_upgrade() {
-  echo "Updating icon cache"
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  echo "Updating mime entries"
-  update-desktop-database -q
-}
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/nvclock/PKGBUILD b/community-staging/nvclock/PKGBUILD
deleted file mode 100644
index 509837a56..000000000
--- a/community-staging/nvclock/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 62728 2012-01-25 08:47:31Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Markus Meissner <markus@meissna.de>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nvclock
-pkgver=0.8b4
-pkgrel=3
-pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
-arch=('i686' 'x86_64')
-url='http://www.linuxhardware.org/nvclock/'
-license=('GPL')
-depends=('gtk2')
-optdepends=('gksu: to start nvclock via the desktop menu entry')
-install='nvclock.install'
-options=('!makeflags')
-source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz"
-        'nvclock-0.8b4-buildfix.patch'
-        'nvclock-0.8b4-linkfix.patch'
-        'nvclock.desktop-use-gksu.patch')
-md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
-         '1da24b50dd6a8c4704fa550a3e1a8b53'
-         'b812646787ea44e693fd2288612f25ad'
-         '98fc1995721d0b0e8ff6d448869eee6d')
-
-build(){
-  cd "${srcdir}/${pkgname}${pkgver}"
-
-  # build and link fixes from Fedora
-  patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch"
-  patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch"
-
-  # Make ".desktop" file use gksu(1).
-  patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch"
-
-  sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in"
-
-  ./configure --prefix=/usr --bindir=/usr/bin
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/nvclock/nvclock-0.8b4-buildfix.patch b/community-staging/nvclock/nvclock-0.8b4-buildfix.patch
deleted file mode 100644
index cdc9f5c88..000000000
--- a/community-staging/nvclock/nvclock-0.8b4-buildfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
---- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
-+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
-@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
- install: install-recursive install-app
- install-app:
- 	mkdir -p $(bindir)
--	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
--	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
-+	$(INSTALL) -c nvclock $(bindir)/nvclock
-+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
- 
- 
- uninstall: uninstall-recursive uninstall-app
-
-
diff --git a/community-staging/nvclock/nvclock-0.8b4-linkfix.patch b/community-staging/nvclock/nvclock-0.8b4-linkfix.patch
deleted file mode 100644
index 0029d1c74..000000000
--- a/community-staging/nvclock/nvclock-0.8b4-linkfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
---- nvclock0.8b4.orign/src/gtk/Makefile.in	2008-05-11 12:25:46.000000000 +0200
-+++ nvclock0.8b4/src/gtk/Makefile.in	2010-02-13 19:56:24.204078277 +0100
-@@ -20,12 +20,12 @@ endif
- ifeq ($(HAVE_NVCONTROL), yes)
-     DEPS=$(libbackend) $(libnvcontrol)
-     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../..
--    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
-+    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl
-     OBJECTS=banner.o gl.o hw.o main.o settings.o
- else
-     DEPS=$(libbackend)
-     INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
--    LIBS=@GTK_LIBS@ -L../backend -lbackend
-+    LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl
-     OBJECTS=banner.o hw.o main.o settings.o
- endif
- 
diff --git a/community-staging/nvclock/nvclock.desktop-use-gksu.patch b/community-staging/nvclock/nvclock.desktop-use-gksu.patch
deleted file mode 100644
index a372f5de8..000000000
--- a/community-staging/nvclock/nvclock.desktop-use-gksu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvclock.desktop.orig	2011-01-16 15:15:55.764977836 +0100
-+++ nvclock.desktop	2011-01-16 15:16:07.827408839 +0100
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=NVCLOCK
- Comment=Overclock and Monitor NVIDIA cards
--Exec=nvclock_gtk
-+Exec=gksu nvclock_gtk
- Icon=nvclock.png
- Terminal=false
- Type=Application
diff --git a/community-staging/nvclock/nvclock.install b/community-staging/nvclock/nvclock.install
deleted file mode 100644
index d59dca6e8..000000000
--- a/community-staging/nvclock/nvclock.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/ogmrip/PKGBUILD b/community-staging/ogmrip/PKGBUILD
deleted file mode 100644
index f2ba757c7..000000000
--- a/community-staging/ogmrip/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62805 2012-01-27 04:23:37Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Daenyth
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-
-pkgname=ogmrip
-pkgver=0.13.7
-pkgrel=3
-pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder"
-arch=('i686' 'x86_64')
-url="http://ogmrip.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
-makedepends=('patch' 'intltool' 'perl-xml-parser' 'faac' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
-optdepends=('faac: support for the AAC audio codec'
-            'lame: support for the MP3 audio codec'
-            'mkvtoolnix: create, alter, and inspect Matroska files'
-            'libtheora: decode and encode Ogg Theora files'
-            'ogmtools: support for the Ogg Media container'
-            'gpac: support for the MP4 container'
-            'vorbis-tools: support for the Ogg Vorbis audio codec'
-            'gocr: support for the SRT subtitle format'
-            'ocrad: support for the SRT subtitle format'
-            'tesseract: support for the SRT subtitle format')
-options=('!libtool' '!makeflags')
-changelog=$pkgname.changelog
-install=ogmrip.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/ogmrip/ogmrip.changelog b/community-staging/ogmrip/ogmrip.changelog
deleted file mode 100644
index 1bd5c70ae..000000000
--- a/community-staging/ogmrip/ogmrip.changelog
+++ /dev/null
@@ -1,21 +0,0 @@
-2012-01-26  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-	* Add .install file
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.7-1
-
-2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.6-1
-
-2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.5
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.4
-
-2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#17517 fixed in minor release O.13.3-2
-
-2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.3
diff --git a/community-staging/ogmrip/ogmrip.install b/community-staging/ogmrip/ogmrip.install
deleted file mode 100644
index 660593cf5..000000000
--- a/community-staging/ogmrip/ogmrip.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-staging/openimageio/PKGBUILD b/community-staging/openimageio/PKGBUILD
deleted file mode 100644
index dd91ef261..000000000
--- a/community-staging/openimageio/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-_pkg=OpenImageIO
-pkgname=openimageio
-pkgver=0.10.4
-pkgrel=5
-pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
-arch=(i686 x86_64)
-url="http://www.openimageio.org/"
-license=('custom')
-depends=('openexr' 'boost-libs' 'jasper' 'glew')
-makedepends=('cmake' 'qt' 'python2' 'boost')
-optdepends=('qt: iv image viewer' 'python2: bindings support')
-options=(!buildflags)
-source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}"
-        "openimageio-0.10.2-libpng15.patch")
-md5sums=('08a1bc2b82862ad5547bba569f4f633f'
-         'd12829808610a54b6bc3350dc5419db3')
-
-build() {
-  cd "$srcdir"/$_pkg*
-
-  # remove insecure rpath
-  sed -i "/RPATH/d" src/CMakeLists.txt
-
-  patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch
-
-  # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204
-  [[ $CARCH == "i686" ]] && make debug || make
-}
-
-package() {
-  cd "$srcdir"/$_pkg*/dist/*
-
-  # prepare dirs
-  install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages}
-
-  # bin
-  cp -r bin include lib "$pkgdir/usr"
-
-  # docs
-  cp -r doc/* "$pkgdir/usr/share/doc/$_pkg"
-
-  # python module
-  cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages"
-
-  # license
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-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/openmotif/PKGBUILD b/community-staging/openmotif/PKGBUILD
deleted file mode 100644
index d7b0f2a89..000000000
--- a/community-staging/openmotif/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 62656 2012-01-23 10:44:50Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Enrico Morelli <morelli@cerm.unifi.it>
-
-pkgname=openmotif
-pkgver=2.3.3
-pkgrel=2
-pkgdesc="Open Motif"
-arch=('i686' 'x86_64')
-url="http://www.motifzone.org/"
-license=('GPL')
-depends=(libxext libxp libxft libxt libxmu libpng libjpeg)
-makedepends=(xbitmaps xproto printproto xextproto automake)
-conflicts=(lesstif)
-options=('!libtool')
-source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz)
-md5sums=('fd27cd3369d6c7d5ef79eccba524f7be')
-
-build() {
-  _automakever=1.11
-
-  cd $srcdir/openmotif-$pkgver
-
-  sed -i 's|.*demos.*||g' Makefile.in Makefile.am
-  sed -i 's|doc \\|doc|g' Makefile.in Makefile.am
-  sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c
-
-  ln -s -f /usr/share/automake-${_automakever}/compile compile
-  ln -s -f /usr/share/libtool/config/config.guess config.guess
-  ln -s -f /usr/share/libtool/config/config.sub config.sub
-  ln -s -f /usr/share/automake-${_automakever}/depcomp depcomp
-  ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh
-  ln -s -f /usr/share/automake-${_automakever}/missing missing
-  ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-  touch NEWS AUTHORS
-
-  [ $NOEXTRACT -eq 1 ] || autoreconf -i
-  [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-  [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr
-  make -j1
-
-  make DESTDIR=$pkgdir install
-  # cleanup
-  (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3)
-}
diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD
deleted file mode 100644
index 326fc0cbc..000000000
--- a/community-staging/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 62394 2012-01-19 19:14:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.1
-pkgrel=4
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
-	osg-xine-1.2.patch)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('c43a25d023e635c3566b2083d8e6d956'
-         'b05a486fdc2aaf06b29efb5e0714672e')
-
-build() {
-  cd OpenSceneGraph-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
-  patch -p1 <$srcdir/osg-xine-1.2.patch
-  make
-}
-
-package() {
-  cd OpenSceneGraph-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-staging/openscenegraph/osg-xine-1.2.patch b/community-staging/openscenegraph/osg-xine-1.2.patch
deleted file mode 100644
index c73b588dc..000000000
--- a/community-staging/openscenegraph/osg-xine-1.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c	2009-11-20 14:46:20.000000000 +0300
-+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c	2012-01-05 02:15:38.000000000 +0400
-@@ -2769,8 +2769,8 @@
- 	clear(rgb_class, sizeof(rgbout_class_t));
- 
- 	rgb_class->driver_class.open_plugin     = open_plugin;
--	rgb_class->driver_class.get_identifier  = get_identifier;
--	rgb_class->driver_class.get_description = get_description;
-+	rgb_class->driver_class.identifier  = get_identifier(NULL);
-+	rgb_class->driver_class.description = get_description(NULL);
- 	rgb_class->driver_class.dispose         = dispose_class;
- 
- 	return(rgb_class);
diff --git a/community-staging/openttd/PKGBUILD b/community-staging/openttd/PKGBUILD
deleted file mode 100644
index ee2ec74e6..000000000
--- a/community-staging/openttd/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 62632 2012-01-22 22:37:56Z lcarlier $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-pkgname=openttd
-pkgver=1.1.5
-pkgrel=1
-pkgdesc='An engine for running Transport Tycoon Deluxe.'
-arch=('i686' 'x86_64')
-url='http://www.openttd.org'
-license=('GPL')
-depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils')
-install=openttd.install
-optdepends=('openttd-opengfx: free graphics' 
-            'openttd-opensfx: free soundset')
-source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-md5sums=('aea731c9f87c53955269446d580ee19e')
-
-build() {
-  cd ${pkgname}-${pkgver} 
-
- ./configure \
-    --prefix-dir=/usr \
-    --binary-name=${pkgname} \
-    --binary-dir=bin \
-    --data-dir=share/${pkgname} \
-    --install-dir=${pkgdir} \
-    --doc-dir=share/doc/${pkgname} \
-    --menu-name="OpenTTD" \
-    --personal-dir=.${pkgname}    
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver} 
-
-  make install
-}
diff --git a/community-staging/openttd/openttd.install b/community-staging/openttd/openttd.install
deleted file mode 100644
index 85b22a1c5..000000000
--- a/community-staging/openttd/openttd.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
-  update-desktop-database > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  update-desktop-database > /dev/null 2>&1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1     
-  update-desktop-database > /dev/null 2>&1
-}
diff --git a/community-staging/paraview/12859-VisItBrige-external-tiff-support.diff b/community-staging/paraview/12859-VisItBrige-external-tiff-support.diff
deleted file mode 100644
index 1901d0146..000000000
--- a/community-staging/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-staging/paraview/PKGBUILD b/community-staging/paraview/PKGBUILD
deleted file mode 100644
index 32fce25f2..000000000
--- a/community-staging/paraview/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.12.0
-pkgrel=3
-pkgdesc='Parallel Visualization Application using VTK'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora')
-makedepends=('cmake' 'desktop-file-utils' 'boost')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
-        'paraview.png'
-        'paraview.desktop'
-        'fix-boost-graph-api-changes.diff'
-        '12859-VisItBrige-external-tiff-support.diff')
-md5sums=('8feabc6261e2060648eaac593d85b1de'
-         'db623002bc71a257ddfdd0c9c7b14c3f'
-         '4e4b7172ed18171c37446fd7c4f1e8f5'
-         '2aa5b98288cadd201ffbd057f18929b0'
-         '9321279c8fc6f289a7cf228648edcb5f')
-
-build() {
-  cd ParaView-${pkgver}/VTK
-  # fix http://www.vtk.org/Bug/view.php?id=12772 remove on next pkgver bump
-  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
-
-  cd ${srcdir}/ParaView-${pkgver}/Utilities/VisItBridge
-  # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump
-  patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff
-
-  mkdir ${srcdir}/build
-  cd ${srcdir}/build
-
-  # flags to enable using system libs
-  local cmake_system_flags=""
-  for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2 OGGTHEORA; do
-    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
-
-  # flags to use python2 instead of python which is 3.x.x on archlinux
-  local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
-
-  # enable when http://paraview.org/Bug/view.php?id=12718 gets fixed
-  #-DCMAKE_SKIP_RPATH:BOOL=YES \
-  # the following flags enable the feature request at https://bugs.archlinux.org/task/27525
-  # -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON -DVISIT_BUILD_READER_CGNS:BOOL=ON
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DPARAVIEW_USE_MPI:BOOL=ON \
-    -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-    -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
-    -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-    -DVISIT_BUILD_READER_CGNS:BOOL=ON \
-    ${cmake_system_flags} \
-    ${cmake_system_python_flags} \
-    ../ParaView-${pkgver}
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Install license
-  install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
-  # Install desktop shortcuts
-  install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
-  desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-}
diff --git a/community-staging/paraview/fix-boost-graph-api-changes.diff b/community-staging/paraview/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 37d78665b..000000000
--- a/community-staging/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-staging/paraview/paraview.desktop b/community-staging/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-staging/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-staging/paraview/paraview.png b/community-staging/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-staging/paraview/paraview.png
+++ /dev/null
diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD
deleted file mode 100644
index b9666e40a..000000000
--- a/community-staging/performous/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 62921 2012-01-29 09:00:49Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=12
-pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
-arch=('i686' 'x86_64')
-url="http://performous.org/"
-license=('GPL')
-depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
-#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \
-#         'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48')
-optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
-        boost-filesystem-v3.patch
-        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a"
-	png15.patch)
-md5sums=('451a759de77984b5a699e91107fe52e2'
-         '42a8c825d80b0de16bd5752d2a80e585'
-         'ff0ffa681dfaa09c4f42133a65309bf0'
-         '89157d5e21b0efd09fcbeee299d23c7e')
-
-build() {
-  cd ${srcdir}/Performous-${pkgver}-Source
-
-  # fix to built against boost 1.46 and later, upstream (git) now support v3
-  patch -Np1 -i ../boost-filesystem-v3.patch
-  # fix with ffmpeg-0.8
-  patch -Np1 -i ../ffmpeg-0.8.patch
-  # fix for libpng 1.5
-  patch -Np1 -i ../png15.patch
-
-  mkdir -p build
-  cd build
-
-  # fix config loading with libxml++
-  export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Performous-${pkgver}-Source/build
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-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/perl-berkeleydb/PKGBUILD b/community-staging/perl-berkeleydb/PKGBUILD
deleted file mode 100644
index 573f61457..000000000
--- a/community-staging/perl-berkeleydb/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 61465 2011-12-31 21:15:35Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Charles Mauch <cmauch@gmail.com>
-# Contributor: Francois Charette <firmicus@gmx.net>
-
-pkgname=perl-berkeleydb
-pkgver=0.50
-pkgrel=2
-pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/BerkeleyDB/"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'db')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('6afc8f49133c262c606d1b96e1412863')
-
-build() {
-  cd  $srcdir/BerkeleyDB-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  _dbver=`pacman -Q db | cut -d\  -f2 | cut -d- -f1`
-  depends=('perl' "db=$_dbver")
-
-  cd  $srcdir/BerkeleyDB-$pkgver
-  make pure_install doc_install DESTDIR=$pkgdir
-  find $pkgdir -name '.packlist' -delete
-  find $pkgdir -name '*.pod' -delete
-}
diff --git a/community-staging/perl-gnome2-wnck/PKGBUILD b/community-staging/perl-gnome2-wnck/PKGBUILD
deleted file mode 100644
index 3fc8e5ce6..000000000
--- a/community-staging/perl-gnome2-wnck/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62480 2012-01-20 09:03:15Z spupykin $
-# Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-pkgname=perl-gnome2-wnck
-pkgver=0.16
-pkgrel=5
-pkgdesc="Perl interface to the Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
-license=("GPL" "Artistic")
-url="http://search.cpan.org/dist/Gnome2-Wnck"
-depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck')
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz")
-md5sums=('439f4569ffd7af96ef1d3feaab23760e')
-
-build() {
-  cd Gnome2-Wnck-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd Gnome2-Wnck-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-staging/perl-gtk2-sexy/PKGBUILD b/community-staging/perl-gtk2-sexy/PKGBUILD
deleted file mode 100644
index de257199e..000000000
--- a/community-staging/perl-gtk2-sexy/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 62482 2012-01-20 09:03:53Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Charles Mauch <cmauch@gmail.com>
-# Creator: Florian Ragwitz <http://search.cpan.org/~/>
-
-pkgname=perl-gtk2-sexy
-pkgver=0.05
-pkgrel=6
-pkgdesc="Perl/CPAN Module Gtk2::Sexy"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Gtk2-Sexy"
-license=('GPL' 'PerlArtistic')
-depends=('gtk2' 'libsexy')
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends' 'gtk2-perl')
-options=(docs !emptydirs)
-source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-${pkgver}.tar.gz")
-md5sums=('3e291808250d7b956ba8443013a1b461')
-
-build() {
-  cd Gtk2-Sexy-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd Gtk2-Sexy-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-staging/perl-gtk2-trayicon/PKGBUILD b/community-staging/perl-gtk2-trayicon/PKGBUILD
deleted file mode 100644
index b292dc294..000000000
--- a/community-staging/perl-gtk2-trayicon/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62484 2012-01-20 09:04:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-
-pkgname=perl-gtk2-trayicon
-pkgver=0.06
-pkgrel=8
-pkgdesc="Perl interface to the EggTrayIcon library"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Gtk2-TrayIcon/"
-depends=('gtk2-perl')
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-license=("GPL")
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-${pkgver}.tar.gz")
-md5sums=('522c328f14681a25d76eeaf317e05049')
-
-build() {
-  cd  Gtk2-TrayIcon-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd  Gtk2-TrayIcon-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-staging/perl-gtk2-webkit/PKGBUILD b/community-staging/perl-gtk2-webkit/PKGBUILD
deleted file mode 100644
index 0b7126ad3..000000000
--- a/community-staging/perl-gtk2-webkit/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62556 2012-01-21 09:12:45Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-
-pkgname=perl-gtk2-webkit
-pkgver=0.09
-pkgrel=2
-pkgdesc="Gtk2::WebKit"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Gtk2-WebKit"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-${pkgver}.tar.gz)
-md5sums=('e696fc2b15d6189370e19bce9a9e56f3')
-
-build() {
-  cd Gtk2-WebKit-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd Gtk2-WebKit-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-staging/pidgin-libnotify/PKGBUILD b/community-staging/pidgin-libnotify/PKGBUILD
deleted file mode 100644
index 500f5d532..000000000
--- a/community-staging/pidgin-libnotify/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
-# Contributor: Hugo Doria <hugodoria@gmail.com>
-# Contributor pidgin-libnotify: 3ED <kas1987@o2.pl>
-
-pkgname=pidgin-libnotify
-pkgver=0.14
-pkgrel=5
-arch=('i686' 'x86_64')
-pkgdesc="pidgin plugin that enables popups when someone logs in or messages you."
-url="http://gaim-libnotify.sourceforge.net/"
-license=('GPL')
-depends=('pidgin' 'libnotify' 'perlxml' 'gettext' 'notification-daemon')
-makedepends=('libtool' 'intltool')
-replaces=('gaim-libnotify')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch
-        pidgin-libnotify-0.14-libnotify-0.7.patch)
-md5sums=('bfb5368b69c02d429b2b17c00a6673c0'
-         'e9bdbb3c7faa61f062fc64277457b6c0'
-         '05538625f14d9f2c12adae5fa6a1fa26')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/language_fixes.patch"
-  patch -p0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch"
-  ./configure --prefix=/usr --disable-deprecated  --disable-static
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/pidgin-libnotify/language_fixes.patch b/community-staging/pidgin-libnotify/language_fixes.patch
deleted file mode 100644
index 6898b0483..000000000
--- a/community-staging/pidgin-libnotify/language_fixes.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-diff -Naur pidgin-libnotify-0.14/po/de.po pidgin-libnotify-0.14/po-new/de.po
---- pidgin-libnotify-0.14/po/de.po	2010-03-09 18:20:47.365124617 +0100
-+++ pidgin-libnotify-0.14/po-new/de.po	2010-03-09 18:02:40.715216935 +0100
-@@ -48,7 +48,7 @@
- #: src/pidgin-libnotify.c:379
- #, c-format
- msgid "%s signed off"
--msgstr "%s hat sich angemeldet"
-+msgstr "%s hat sich abgemeldet"
- 
- #: src/pidgin-libnotify.c:406
- #, c-format
-diff -Naur pidgin-libnotify-0.14/po/et.po pidgin-libnotify-0.14/po-new/et.po
---- pidgin-libnotify-0.14/po/et.po	1970-01-01 01:00:00.000000000 +0100
-+++ pidgin-libnotify-0.14/po-new/et.po	2010-03-09 18:14:58.831811232 +0100
-@@ -0,0 +1,80 @@
-+# Pidgin-libnotify translation to Estonian language.
-+# Copyright (C) 2009 The Gnome Translation Team.
-+# This file is distributed under the same license as the pidgin-libnotify package.
-+# Mattias Põldaru <mahfiaz gmail com>, 2009.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: Pdgin Libnotify\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-03-23 11:04+0200\n"
-+"PO-Revision-Date: 2009-03-23 11:09+0300\n"
-+"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
-+"Language-Team: Gnome Estonian Translation Team <gnome-et@linux.ee>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural = n!=1;\n"
-+"X-Poedit-Language: Estonian\n"
-+
-+#: ../src/pidgin-libnotify.c:57
-+msgid "New messages"
-+msgstr "Uutele sõnumitele"
-+
-+#: ../src/pidgin-libnotify.c:62
-+msgid "Only new conversations"
-+msgstr "Ainult uutele vestlustele"
-+
-+#: ../src/pidgin-libnotify.c:67
-+msgid "Ignore events from blocked users"
-+msgstr "Blokitud kasutajaid eiratakse"
-+
-+#: ../src/pidgin-libnotify.c:72
-+msgid "Buddy signs on"
-+msgstr "Sõber logib sisse"
-+
-+#: ../src/pidgin-libnotify.c:77
-+msgid "Buddy signs off"
-+msgstr "Sõber logib välja"
-+
-+#: ../src/pidgin-libnotify.c:82
-+msgid "Only when available"
-+msgstr "Ainult siis, kui olekuks on saadaval"
-+
-+#: ../src/pidgin-libnotify.c:320
-+msgid "Show"
-+msgstr "Näita"
-+
-+#: ../src/pidgin-libnotify.c:352
-+#, c-format
-+msgid "%s signed on"
-+msgstr "%s logis sisse"
-+
-+#: ../src/pidgin-libnotify.c:384
-+#, c-format
-+msgid "%s signed off"
-+msgstr "%s logis välja"
-+
-+#: ../src/pidgin-libnotify.c:411
-+#, c-format
-+msgid "%s says:"
-+msgstr "%s ütleb:"
-+
-+#: ../src/pidgin-libnotify.c:577
-+msgid "Libnotify Popups"
-+msgstr "Libnotify hüpikaknad"
-+
-+#: ../src/pidgin-libnotify.c:578
-+msgid "Displays popups via libnotify."
-+msgstr "Kuvab hüpikaknaid kasutades libnotify'd."
-+
-+#: ../src/pidgin-libnotify.c:579
-+msgid ""
-+"Pidgin-libnotify:\n"
-+"Displays popups via libnotify."
-+msgstr ""
-+"Pidgin-libnotify:\n"
-+"Kuvab hüpikaknaid kasutades libnotify'd."
-+
-+
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/hu.po pidgin-libnotify-0.14/po-new/hu.po
---- pidgin-libnotify-0.14/po/hu.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/hu.po	2010-03-09 18:13:38.721834227 +0100
-@@ -1,8 +1,7 @@
- msgid ""
- msgstr ""
--"Project-Id-Version: \n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
-+"Project-Id-Version: pidgin-libnotify\n"
-+"POT-Creation-Date: \n"
- "PO-Revision-Date: 2006-11-01 18:33+0100\n"
- "Last-Translator: Peter Avramucz <muczy@freestart.hu>\n"
- "Language-Team: \n"
-@@ -11,58 +10,58 @@
- "Content-Transfer-Encoding: 8bit\n"
- "X-Poedit-Country: HUNGARY\n"
- 
--#: src/pidgin-libnotify.c:57
-+#: src/gaim-libnotify.c:57
- msgid "New messages"
- msgstr "Új üzenetek"
- 
--#: src/pidgin-libnotify.c:62
-+#: src/gaim-libnotify.c:62
- msgid "Only new conversations"
- msgstr "Csak az új beszélgetéseknél"
- 
--#: src/pidgin-libnotify.c:67
-+#: src/gaim-libnotify.c:67
- msgid "Ignore events from blocked users"
- msgstr "Hagyja figyelmen kívűl a blokkolt felhasználókat"
- 
--#: src/pidgin-libnotify.c:72
-+#: src/gaim-libnotify.c:72
- msgid "Buddy signs on"
- msgstr "Partner bejelentkezett"
- 
--#: src/pidgin-libnotify.c:77
-+#: src/gaim-libnotify.c:77
- msgid "Buddy signs off"
- msgstr "Partner kijelentkezett"
- 
--#: src/pidgin-libnotify.c:315
-+#: src/gaim-libnotify.c:295
- msgid "Show"
- msgstr "Mutasd"
- 
--#: src/pidgin-libnotify.c:347
-+#: src/gaim-libnotify.c:324
- #, c-format
- msgid "%s signed on"
- msgstr "%s bejelentkezett"
- 
--#: src/pidgin-libnotify.c:379
-+#: src/gaim-libnotify.c:353
- #, c-format
- msgid "%s signed off"
- msgstr "%s kijelentkezett"
- 
--#: src/pidgin-libnotify.c:406
-+#: src/gaim-libnotify.c:380
- #, c-format
- msgid "%s says:"
- msgstr "%s mondja:"
- 
--#: src/pidgin-libnotify.c:572
-+#: src/gaim-libnotify.c:543
- msgid "Libnotify Popups"
- msgstr "Libnotify buborékok"
- 
--#: src/pidgin-libnotify.c:573
-+#: src/gaim-libnotify.c:544
- msgid "Displays popups via libnotify."
- msgstr "Mutassa a buborékokat libnotify segítségével."
- 
--#: src/pidgin-libnotify.c:574
--#, fuzzy
-+#: src/gaim-libnotify.c:545
- msgid ""
--"Pidgin-libnotify:\n"
-+"Gaim-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
- "Gaim-libnotify:\n"
- "Mutassa a buborékokat libnotify segítségével."
-+
-diff -Naur pidgin-libnotify-0.14/po/it.po pidgin-libnotify-0.14/po-new/it.po
---- pidgin-libnotify-0.14/po/it.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/it.po	2010-03-09 18:03:34.565229551 +0100
-@@ -1,79 +1,78 @@
- # Italian (it) translation of gaim-libnotify.
--# Copyright (C) 2006, Marco Cabizza <marco87@gmail.com>
--#
- # This file is distributed under the same license as gaim-libnotify.
-+# Copyright (C) 2006, Marco Cabizza <marco87@gmail.com>
-+# Copyright (C) 2009, The Free Software Foundation, Inc.
-+# Gruppo traduzione italiano di Ubuntu, <gruppo-traduzione@ubuntu-it.org>
-+# Milo Casagrande <milo@ubuntu.com>
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: gaim-libnotify\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
--"PO-Revision-Date: 2007-05-25 12:30-0300\n"
--"Last-Translator: Marco Cabizza <marco87@gmail.com>\n"
-+"POT-Creation-Date: 2009-09-29 16:23+0000\n"
-+"PO-Revision-Date: 2009-11-04 15:15+0000\n"
-+"Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
- "Language-Team: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=2; plural=n != 1;\n"
-+"X-Launchpad-Export-Date: 2009-11-11 17:20+0000\n"
-+"X-Generator: Launchpad (build Unknown)\n"
- 
--#: src/pidgin-libnotify.c:57
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:95
- msgid "New messages"
- msgstr "Nuovi messaggi"
- 
--#: src/pidgin-libnotify.c:62
-+#: ../src/pidgin-libnotify.c:100
- msgid "Only new conversations"
--msgstr "Solo le nuove finestre"
-+msgstr "Solo nuove conversazioni"
- 
--#: src/pidgin-libnotify.c:67
-+#: ../src/pidgin-libnotify.c:105
- msgid "Ignore events from blocked users"
--msgstr "Ignora gli utenti bloccati"
-+msgstr "Ignora eventi da utenti bloccati"
- 
--#: src/pidgin-libnotify.c:72
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:110
- msgid "Buddy signs on"
--msgstr "%s entra"
-+msgstr "Il conoscente si connette"
- 
--#: src/pidgin-libnotify.c:77
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:115
- msgid "Buddy signs off"
--msgstr "%s entra"
-+msgstr "Il conoscente si disconnette"
- 
--#: src/pidgin-libnotify.c:315
-+#: ../src/pidgin-libnotify.c:120
-+msgid "Only when available"
-+msgstr "Solo quando disponibile"
-+
-+#: ../src/pidgin-libnotify.c:125
-+msgid "Names to remove notifications for"
-+msgstr "Nomi per cui rimuovere le notifiche"
-+
-+#: ../src/pidgin-libnotify.c:505
- msgid "Show"
- msgstr "Mostra"
- 
--#: src/pidgin-libnotify.c:347
--#, c-format
--msgid "%s signed on"
--msgstr "%s è entrato"
--
--#: src/pidgin-libnotify.c:379
--#, fuzzy, c-format
--msgid "%s signed off"
--msgstr "%s è entrato"
--
--#: src/pidgin-libnotify.c:406
--#, c-format
--msgid "%s says:"
--msgstr "%s dice:"
-+#: ../src/pidgin-libnotify.c:538
-+msgid "is online"
-+msgstr "è in linea"
-+
-+#: ../src/pidgin-libnotify.c:567
-+msgid "is offline"
-+msgstr "non è in linea"
- 
--#: src/pidgin-libnotify.c:572
-+#: ../src/pidgin-libnotify.c:1399
- msgid "Libnotify Popups"
--msgstr "Popups di libnotify"
-+msgstr "Notifiche di libnotify"
- 
--#: src/pidgin-libnotify.c:573
-+#: ../src/pidgin-libnotify.c:1400
- msgid "Displays popups via libnotify."
--msgstr "Mostra avvisi mediante libnotify."
-+msgstr "Visualizza le notifiche mediante libnotify."
- 
--#: src/pidgin-libnotify.c:574
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:1401
- msgid ""
- "Pidgin-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
--"Gaim-libnotify:\n"
--"Mostra avvisi mediante libnotify."
-+"Pidgin-libnotify:\n"
-+"Visualizza le notifiche mediante libnotify."
- 
--#~ msgid "Libnotify Interface"
--#~ msgstr "Interfaccia libnotify"
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/nl.po pidgin-libnotify-0.14/po-new/nl.po
---- pidgin-libnotify-0.14/po/nl.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/nl.po	2010-03-09 18:17:48.188461774 +0100
-@@ -31,12 +31,12 @@
- 
- #: src/pidgin-libnotify.c:72
- msgid "Buddy signs on"
--msgstr "Contactpersoon heeft zich aangemeld"
-+msgstr "Contactpersoon meldt zich aan"
- 
- #: src/pidgin-libnotify.c:77
- #, fuzzy
- msgid "Buddy signs off"
--msgstr "Contactpersoon heeft zich aangemeld"
-+msgstr "Contactpersoon meldt zich af"
- 
- #: src/pidgin-libnotify.c:315
- msgid "Show"
-@@ -50,7 +50,7 @@
- #: src/pidgin-libnotify.c:379
- #, fuzzy, c-format
- msgid "%s signed off"
--msgstr "%s heeft zich aangemeld"
-+msgstr "%s heeft zich afgemeld"
- 
- #: src/pidgin-libnotify.c:406
- #, c-format
-@@ -59,7 +59,7 @@
- 
- #: src/pidgin-libnotify.c:572
- msgid "Libnotify Popups"
--msgstr ""
-+msgstr "Libnotify Popups"
- 
- #: src/pidgin-libnotify.c:573
- msgid "Displays popups via libnotify."
-@@ -71,7 +71,7 @@
- "Pidgin-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
--"Gaim-libnotify:\n"
-+"Pidgin-libnotify:\n"
- "Toont popups via libnotify."
- 
- #~ msgid "Libnotify Interface"
-diff -Naur pidgin-libnotify-0.14/po/pl.po pidgin-libnotify-0.14/po-new/pl.po
---- pidgin-libnotify-0.14/po/pl.po	2008-12-14 18:03:42.000000000 +0100
-+++ pidgin-libnotify-0.14/po-new/pl.po	2010-03-09 18:09:47.555190702 +0100
-@@ -1,22 +1,18 @@
--# Polish (pl) translation of gaim-libnotify
--# Copyright (C) 2006, Krzysztof Rosiński <kr@post.pl>
--# This file is distributed under the same license as the gaim-libnotify package.
-+# translation of pl.po to Polish
- # Krzysztof Rosiński <kr@post.pl>, 2006.
- # Piotr Drąg <raven@pmail.pl>, 2007.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: gaim-libnotify\n"
-+"Project-Id-Version: pl\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-06-30 19:58+0000\n"
--"PO-Revision-Date: 2006-03-13 19:39+ZONE\n"
-+"PO-Revision-Date: 2007-06-09 19:00+0200\n"
- "Last-Translator: Piotr Drąg <raven@pmail.pl>\n"
- "Language-Team: Polish <pl@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
--"|| n%100>=20) ? 1 : 2);\n"
- 
- #: src/pidgin-libnotify.c:57
- msgid "New messages"
-@@ -73,3 +69,5 @@
- "Pidgin-libnotify:\n"
- "Wyświetla powiadomienia przez libnotify."
- 
-+
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/ro.po pidgin-libnotify-0.14/po-new/ro.po
---- pidgin-libnotify-0.14/po/ro.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/ro.po	2010-03-09 18:14:01.732650658 +0100
-@@ -8,69 +8,66 @@
- msgstr ""
- "Project-Id-Version: ro\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
--"PO-Revision-Date: 2007-01-25 22:00+0200\n"
--"Last-Translator: Ion Alin <alyn3d@gmail.com>\n"
--"Language-Team:  <ro@li.org>\n"
-+"POT-Creation-Date: 2009-04-24 10:15+0000\n"
-+"PO-Revision-Date: 2009-09-10 13:40+0000\n"
-+"Last-Translator: Adi Roiban <adi@roiban.ro>\n"
-+"Language-Team: <ro@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.11.4\n"
--"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
--"20)) ? 1 : 2;\n"
-+"X-Launchpad-Export-Date: 2009-09-10 16:28+0000\n"
-+"X-Generator: Launchpad (build Unknown)\n"
- 
--#: src/pidgin-libnotify.c:57
-+#: ../src/pidgin-libnotify.c:75
- msgid "New messages"
- msgstr "Mesaje noi"
- 
--#: src/pidgin-libnotify.c:62
-+#: ../src/pidgin-libnotify.c:80
- msgid "Only new conversations"
--msgstr "Numai conversatii noi"
-+msgstr "Doar conversațiile noi"
- 
--#: src/pidgin-libnotify.c:67
-+#: ../src/pidgin-libnotify.c:85
- msgid "Ignore events from blocked users"
--msgstr "Ignora evenimentele de la utilizatorii blocati"
-+msgstr "Ignoră evenimentele de la utilizatorii blocați"
- 
--#: src/pidgin-libnotify.c:72
-+#: ../src/pidgin-libnotify.c:90
- msgid "Buddy signs on"
--msgstr "Userul este online"
-+msgstr "Contact conectat"
- 
--#: src/pidgin-libnotify.c:77
-+#: ../src/pidgin-libnotify.c:95
- msgid "Buddy signs off"
--msgstr "Userul este offline"
-+msgstr "Contact deconectat"
- 
--#: src/pidgin-libnotify.c:315
-+#: ../src/pidgin-libnotify.c:100
-+msgid "Only when available"
-+msgstr "Doar când sunt disponibil(ă)"
-+
-+#: ../src/pidgin-libnotify.c:454
- msgid "Show"
--msgstr "Arata"
-+msgstr "Afișează"
-+
-+#: ../src/pidgin-libnotify.c:487
-+msgid "is online"
-+msgstr "s-a conectat"
- 
--#: src/pidgin-libnotify.c:347
--#, c-format
--msgid "%s signed on"
--msgstr "%s este online"
--
--#: src/pidgin-libnotify.c:379
--#, c-format
--msgid "%s signed off"
--msgstr "%s este offline"
--
--#: src/pidgin-libnotify.c:406
--#, c-format
--msgid "%s says:"
--msgstr "%s spune:"
-+#: ../src/pidgin-libnotify.c:516
-+msgid "is offline"
-+msgstr "s-a deconectat"
- 
--#: src/pidgin-libnotify.c:572
-+#: ../src/pidgin-libnotify.c:1200
- msgid "Libnotify Popups"
--msgstr "Pop-up Libnotify"
-+msgstr "Notificări libnotify"
- 
--#: src/pidgin-libnotify.c:573
-+#: ../src/pidgin-libnotify.c:1201
- msgid "Displays popups via libnotify."
--msgstr "Arata popup-uri via libnotify."
-+msgstr "Afișează notificări via libnotify."
- 
--#: src/pidgin-libnotify.c:574
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:1202
- msgid ""
- "Pidgin-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
--"Gaim-libnotify:\n"
--"Arata popup-uri via libnotify."
-+"Pidgin-libnotify:\n"
-+"Afișează notificări via libnotify."
-+
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/ru.po pidgin-libnotify-0.14/po-new/ru.po
---- pidgin-libnotify-0.14/po/ru.po	2008-12-14 18:09:59.000000000 +0100
-+++ pidgin-libnotify-0.14/po-new/ru.po	2010-03-09 18:08:58.941861562 +0100
-@@ -7,11 +7,11 @@
- msgstr ""
- "Project-Id-Version: gaim-libnotify\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
-+"POT-Creation-Date: 2009-08-07 18:45+0000\n"
- "PO-Revision-Date: 2007-11-29 12:30-0300\n"
- "Last-Translator: Dmitry Egorkin <egorkin@gmail.com>\n"
- "Language-Team: Russian\n"
--"MIME-Version: 1.0\n"
-+"MIME-Version: 1.1\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=2; plural=n != 1;\n"
-@@ -43,12 +43,12 @@
- #: src/pidgin-libnotify.c:347
- #, c-format
- msgid "%s signed on"
--msgstr "%s пришёл"
-+msgstr "%s в сети"
- 
- #: src/pidgin-libnotify.c:379
- #, c-format
- msgid "%s signed off"
--msgstr "%s ушёл"
-+msgstr "%s не в сети"
- 
- #: src/pidgin-libnotify.c:406
- #, c-format
-@@ -73,3 +73,5 @@
- 
- #~ msgid "Libnotify Interface"
- #~ msgstr "Настройки libnotify"
-+
-+ 	  	 
diff --git a/community-staging/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch b/community-staging/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch
deleted file mode 100644
index 40e6c02b8..000000000
--- a/community-staging/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/pidgin-libnotify.c
-+++ src/pidgin-libnotify.c
-@@ -286,7 +286,15 @@
- 		g_free (tr_body);
- 		return;
- 	}
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	notification = notify_notification_new (title, tr_body, NULL);
-+#else
- 	notification = notify_notification_new (title, tr_body, NULL, NULL);
-+#endif
-+#else
-+	notification = notify_notification_new (title, tr_body, NULL, NULL);
-+#endif
- 	purple_debug_info (PLUGIN_ID, "notify(), new: "
- 					 "title: '%s', body: '%s', buddy: '%s'\n",
- 					 title, tr_body, best_name (buddy));
diff --git a/community-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 5740f6337..000000000
--- a/community-staging/pingus/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 62941 2012-01-29 12:09:55Z lcarlier $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.6
-pkgrel=2
-pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
-arch=('i686' 'x86_64')
-url="http://pingus.seul.org"
-license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48')
-makedepends=('scons' 'boost>=1.48' 'mesa')
-source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-	pingus.desktop)
-md5sums=('561798686f34d3fa4e69135d655f47ac'
-         '9eec34047bdcff49e08f41e81764e20c')
-sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
-          '579a1144f161ce89e6e024cea37210149b89c0c0')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  scons prefix=/usr
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make install DESTDIR="${pkgdir}" PREFIX="/usr"
-
-  install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
-}
diff --git a/community-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/png2ico/PKGBUILD b/community-staging/png2ico/PKGBUILD
deleted file mode 100644
index 135b1fee6..000000000
--- a/community-staging/png2ico/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 62486 2012-01-20 09:05:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=png2ico
-pkgver=20021208
-pkgrel=5
-arch=('i686' 'x86_64')
-pkgdesc="Converts PNG files to Windows icon resource files"
-url="http://www.winterdrache.de/freeware/png2ico/"
-license=("GPL2")
-depends=('libpng' 'gcc')
-source=(http://www.winterdrache.de/freeware/png2ico/data/$pkgname-src-2002-12-08.tar.gz)
-md5sums=('9b663df81c826cd564638cba2e6bc75b')
-
-build() {
-  cd ${srcdir}/${pkgname}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}
-  install -D -m755 png2ico ${pkgdir}/usr/bin/png2ico
-  install -D -m644 doc/png2ico.1 ${pkgdir}/usr/share/man/man1/png2ico.1
-}
diff --git a/community-staging/podofo/PKGBUILD b/community-staging/podofo/PKGBUILD
deleted file mode 100644
index a71825b8a..000000000
--- a/community-staging/podofo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 62345 2012-01-19 12:22:37Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Preecha Patumchareonpol <yumyai at gmail.com> 
-
-pkgname=podofo
-pkgver=0.9.1
-pkgrel=3
-pkgdesc="A C++ library to work with the PDF file format"
-arch=('i686' 'x86_64')
-url="http://podofo.sourceforge.net"
-license=('GPL')
-depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
-makedepends=('cmake')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DPODOFO_BUILD_SHARED=1 \
-        -DPODOFO_HAVE_JPEG_LIB=1 \
-        -DPODOFO_HAVE_PNG_LIB=1 \
-        -DPODOFO_HAVE_TIFF_LIB=1
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/poedit/PKGBUILD b/community-staging/poedit/PKGBUILD
deleted file mode 100644
index eee2cfc84..000000000
--- a/community-staging/poedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61467 2011-12-31 21:16:10Z spupykin $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=poedit
-pkgver=1.4.6.1
-pkgrel=6
-pkgdesc="Cross-platform gettext catalogs (.po files) editor"
-arch=('i686' 'x86_64')
-url="http://www.poedit.net/"
-license=('custom')
-depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext')
-makedepends=('pkgconfig')
-install=poedit.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c63ffd991b1a6085ef356a6922356e0a')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-    install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-staging/poedit/poedit.install b/community-staging/poedit/poedit.install
deleted file mode 100644
index 21b79d2d4..000000000
--- a/community-staging/poedit/poedit.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() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/prboom/PKGBUILD b/community-staging/prboom/PKGBUILD
deleted file mode 100644
index 37f3f5537..000000000
--- a/community-staging/prboom/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62722 2012-01-25 08:09:55Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: dale <dale@archlinux.org>
-
-pkgname=prboom
-pkgver=2.5.0
-pkgrel=6
-pkgdesc='A game engine which provides a program to play Doom levels.'
-url='http://prboom.sourceforge.net/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net')
-source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
-        'libpng-1.4.patch')
-md5sums=('a8a15f61fa2626ab98051ab2703378c4'
-         'ba53474db8e747035ca2320a445e4ae0')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 < ../libpng-1.4.patch
-
-	./configure --prefix=/usr --disable-i386-asm
-	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/community-staging/prboom/libpng-1.4.patch b/community-staging/prboom/libpng-1.4.patch
deleted file mode 100644
index a2215e37b..000000000
--- a/community-staging/prboom/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
---- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
-+++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
-@@ -231,7 +231,7 @@
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
diff --git a/community-staging/pyqt3/PKGBUILD b/community-staging/pyqt3/PKGBUILD
deleted file mode 100644
index 53ea4b36c..000000000
--- a/community-staging/pyqt3/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62488 2012-01-20 09:05:44Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgname=pyqt3
-pkgver=3.18.1
-pkgrel=10
-pkgdesc="A set of Python bindings for the Qt3 toolkit"
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/pyqt/intro"
-depends=('python2-sip' 'qscintilla-qt3')
-license=('GPL')
-source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
-
-build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  . /etc/profile.d/qt3.sh
-  echo yes | python2 configure.py -b /usr/bin \
-    -d /usr/lib/python2.7/site-packages \
-    -v /usr/share/sip
-  make
-}
-
-package() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/python-bsddb/LICENSE b/community-staging/python-bsddb/LICENSE
deleted file mode 100644
index 7d6035775..000000000
--- a/community-staging/python-bsddb/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2008-2009 Jesus Cea Avion
-
-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.
\ No newline at end of file
diff --git a/community-staging/python-bsddb/PKGBUILD b/community-staging/python-bsddb/PKGBUILD
deleted file mode 100644
index b1b4866bf..000000000
--- a/community-staging/python-bsddb/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 61585 2012-01-03 19:02:28Z stephane $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-bsddb
-pkgname=('python2-bsddb' 'python-bsddb')
-pkgver=5.2.0
-pkgrel=3
-pkgdesc="Python interface for BerkeleyDB"
-license=('MIT')
-arch=('i686' 'x86_64')
-url="http://www.jcea.es/programacion/pybsddb.htm"
-makedepends=('python2-distribute' 'python-distribute')
-source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
-        db_5.3.patch
-        LICENSE)
-sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8'
-          '150bb6ce1758ca29f55e876ac75dbac76c9d743d'
-          'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-build () {
-  cd "${srcdir}"
-  
-  pushd bsddb3-${pkgver}
-  patch -Np1 -i ../db_5.3.patch
-  popd
-
-  cp -r bsddb3-${pkgver}{,-python2}
-
-  # Build python 3 module
-  cd bsddb3-${pkgver}
-  python setup.py --berkeley-db=/usr build
-
-  # Build python 2 module
-  cd ../bsddb3-${pkgver}-python2
-  python2 setup.py --berkeley-db=/usr build
-}
-
-package_python2-bsddb() {
-  depends=('db' 'python2>=2.7')
-  cd "${srcdir}/bsddb3-${pkgver}-python2"
-
-  python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python-bsddb() {
-  depends=('db' 'python>=3.2')
-  cd "${srcdir}/bsddb3-${pkgver}"
-
-  python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-staging/python-bsddb/db_5.3.patch b/community-staging/python-bsddb/db_5.3.patch
deleted file mode 100644
index 6ea4d18bb..000000000
--- a/community-staging/python-bsddb/db_5.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Jesus Cea <jcea@jcea.es>
-# Date 1324876054 -3600
-# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12
-# Parent  670b1ec4472908a9dc745a338a9f595f92aba667
-Support Berkeley DB 5.3.x
-
-diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py
---- a/setup2.py	Mon Dec 26 06:04:34 2011 +0100
-+++ b/setup2.py	Mon Dec 26 06:07:34 2011 +0100
-@@ -128,7 +128,7 @@
-     incdir = libdir = None
-     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
-         # Supported Berkeley DB versions, in order of preference.
--        db_ver_list = ((5, 2), (5, 1), (5, 0),
-+        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
-                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2))
- 
-         # construct a list of paths to look for the header file in on
-
diff --git a/community-staging/python-galago-gtk/PKGBUILD b/community-staging/python-galago-gtk/PKGBUILD
deleted file mode 100644
index 63427fcf1..000000000
--- a/community-staging/python-galago-gtk/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 62490 2012-01-20 09:06:25Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python-galago-gtk
-pkgver=0.5.0
-pkgrel=6
-pkgdesc="A library of simple functions that are optimized for various CPUs"
-arch=('i686' 'x86_64')
-url="http://galago-project.org"
-options=('!libtool')
-license=('LGPL')
-depends=('libgalago-gtk' 'pygtk' 'python-galago')
-source=(http://galago-project.org/files/releases/source/galago-gtk-python/galago-gtk-python-$pkgver.tar.bz2)
-md5sums=('3eb752eaa87d986bf272cf1266528c43')
-
-build() {
-  cd $srcdir/galago-gtk-python-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/python2-matplotlib/PKGBUILD b/community-staging/python2-matplotlib/PKGBUILD
deleted file mode 100644
index 2c647212e..000000000
--- a/community-staging/python2-matplotlib/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 62667 2012-01-24 00:10:45Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgname=python2-matplotlib
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="A python plotting library, making publication quality plots"
-arch=('i686' 'x86_64')
-url="http://matplotlib.sourceforge.net/"
-backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
-depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt')
-optdepends=('pygtk: for use with the GTK or GTKAgg backend'
-            'tk: used by the TkAgg backend'
-            'wxpython: for use with the WXAgg backend')
-makedepends=('pygtk' 'tk' 'wxpython')
-provides=('matplotlib' "python-matplotlib=${pkgver}")
-replaces=('python-matplotlib')
-conflicts=('python-matplotlib')
-source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz"
-         setup.cfg)
-sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae'
-          'bcb5a83db9d95c96a57ca518fa6bd1897b23558f')
-license=('custom')
-
-build() {
-   cd "${srcdir}/matplotlib-${pkgver}"
-
-   cp ../setup.cfg .
-
-   # remove internal copy of pyparsing
-   rm lib/matplotlib/pyparsing.py
-   sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py
-
-   # python2 fix
-   for file in $(find . -name '*.py' -print); do
-      sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
-             -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
-   done
-
-   python2 setup.py build
-}
-
-package() {
-   cd "${srcdir}/matplotlib-${pkgver}"
-   python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
-    
-   install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-   install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}"
-}
diff --git a/community-staging/python2-matplotlib/setup.cfg b/community-staging/python2-matplotlib/setup.cfg
deleted file mode 100644
index 4b82986e9..000000000
--- a/community-staging/python2-matplotlib/setup.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-tag_svn_revision = 1
-
-[directories]
-# Uncomment to override the default basedir in setupext.py.
-# This can be a single directory or a space-delimited list of directories.
-#basedirlist = /usr
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-#dateutil = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
-# these toolkits requires AGG, the Anti-Grain Geometry library,
-# which is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = True
-gtkagg = True
-tkagg = True
-wxagg = True
-macosx = False
-
-[rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
-# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
-# if you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
-backend = Qt4Agg
-#
-# The numerix module was historically used to provide
-# compatibility between the Numeric, numarray, and NumPy array
-# packages. Now that NumPy has emerge as the universal array
-# package for python, numerix is not really necessary and is
-# maintained to provide backward compatibility. Do not change
-# this unless you have a compelling reason to do so.
-numerix = numpy
diff --git a/community-staging/qcad/PKGBUILD b/community-staging/qcad/PKGBUILD
deleted file mode 100644
index a357e619f..000000000
--- a/community-staging/qcad/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 62494 2012-01-20 09:33:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=qcad
-pkgver=2.0.5.0
-pkgrel=9
-pkgdesc="A 2D CAD package based upon Qt"
-arch=('i686' 'x86_64')
-url="http://www.ribbonsoft.com/qcad.html"
-license=('GPL2')
-depends=('qt3')
-options=(libtool)
-source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
-        qcad.xpm
-        QCad.desktop
-        qcad-intptr.patch
-        qcad.patch)
-       # http://ghost1227.com/files/misc/qm.tar.gz)
-md5sums=('96b6a56027782aec953c9c4e64c5998c'
-         'da32fec0d2fb85d96126bf28bb0ab9ff'
-         'b4d1eb6724b4b41f191f1ab6fd859c39'
-         '92f900fe1fd3a8f841232b587b49c7da'
-         '7e6779b1e3b10da1eb4daf36d93f8479')
-
-build() {
-  export PATH="/opt/qt/bin:$PATH"
-  export QTDIR=/opt/qt
-
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
-
-  #Arch64 fix - gentoo patch
-  [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch
-  patch -p1 < ../qcad.patch
-  sed -i "s:"-pedantic"::g" mkspecs/defs.pro
-
-  cd scripts
-  ./build_qcad.sh notrans
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
-
-  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
-  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
-  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
-  install -m644 ../../QCad.desktop \
-    ${pkgdir}/usr/share/applications/QCad.desktop
-  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
-  #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
-}
diff --git a/community-staging/qcad/QCad.desktop b/community-staging/qcad/QCad.desktop
deleted file mode 100644
index a55f5940f..000000000
--- a/community-staging/qcad/QCad.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad.xpm
-Name=QCad
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Application;Office;
diff --git a/community-staging/qcad/qcad-intptr.patch b/community-staging/qcad/qcad-intptr.patch
deleted file mode 100644
index 6d8b6acca..000000000
--- a/community-staging/qcad/qcad-intptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -0500
-@@ -849,7 +849,7 @@
-         os << " layer: NULL ";
-     } else {
-         os << " layer: " << e.layer->getName().latin1() << " ";
--        os << " layer address: " << (int)(e.layer) << " ";
-+        os << " layer address: " << (intptr_t)(e.layer) << " ";
-     }
- 
-     os << e.pen << "\n";
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -0500
-@@ -57,7 +57,7 @@
-     os << " name: " << l.getName().latin1()
-     << " pen: " << l.getPen()
- 	<< " frozen: " << (int)l.isFrozen()
--	<< " address: " << (int)(&l)
-+	<< " address: " << (intptr_t)(&l)
-     << std::endl;
-     return os;
- }
diff --git a/community-staging/qcad/qcad.patch b/community-staging/qcad/qcad.patch
deleted file mode 100644
index f051f29af..000000000
--- a/community-staging/qcad/qcad.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
-@@ -37,6 +37,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstring>
- 
- #include "dl_attributes.h"
- #include "dl_codes.h"
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
-@@ -23,7 +23,7 @@
- ** not clear to you.
- **
- **********************************************************************/
--
-+#include <cstdlib>
- #include "rs_actionzoompan.h"
- #include "rs_snapper.h"
- #include "rs_point.h"
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
-@@ -25,7 +25,7 @@
- **********************************************************************/
- 
- #include "rs_information.h"
--
-+#include <cstdlib>
- #include "rs_constructionline.h"
- 
- 
-diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
-@@ -16,9 +16,6 @@
- echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
- echo
- 
--echo "QTDIR is: $QTDIR"
--echo "QMAKESPEC is: $QMAKESPEC"
--
- # detect system:
- if [ "x$OS" == "xWindows_NT" ]
- then
diff --git a/community-staging/qcad/qcad.xpm b/community-staging/qcad/qcad.xpm
deleted file mode 100644
index e747fa984..000000000
--- a/community-staging/qcad/qcad.xpm
+++ /dev/null
@@ -1,132 +0,0 @@
-/* XPM */
-static const char * qcad_xpm[] = {
-"32 32 97 2",
-"  	c None",
-". 	c #3F3F3F",
-"+ 	c #010180",
-"@ 	c #FFFFFF",
-"# 	c #E0E0EF",
-"$ 	c #41419F",
-"% 	c #4545A1",
-"& 	c #4949A3",
-"* 	c #4D4DA5",
-"= 	c #5151A7",
-"- 	c #5555A9",
-"; 	c #5959AB",
-"> 	c #4444A2",
-", 	c #3C3C9D",
-"' 	c #40409F",
-") 	c #4444A1",
-"! 	c #4848A3",
-"~ 	c #4C4CA5",
-"{ 	c #5050A7",
-"] 	c #5454A9",
-"^ 	c #5858AB",
-"/ 	c #5D5DAD",
-"( 	c #6161AF",
-"_ 	c #6565B1",
-": 	c #5C5CAD",
-"< 	c #6060AF",
-"[ 	c #6464B1",
-"} 	c #6868B3",
-"| 	c #6C6CB5",
-"1 	c #7070B7",
-"2 	c #7474B9",
-"3 	c #7878BB",
-"4 	c #3F3F9E",
-"5 	c #4343A0",
-"6 	c #4747A3",
-"7 	c #4B4BA5",
-"8 	c #000000",
-"9 	c #7C7CBD",
-"0 	c #8080BF",
-"a 	c #4747A2",
-"b 	c #4B4BA4",
-"c 	c #4F4FA6",
-"d 	c #7B7BBD",
-"e 	c #7F7FBF",
-"f 	c #8383C1",
-"g 	c #5353A8",
-"h 	c #8787C3",
-"i 	c #5757AA",
-"j 	c #8B8BC5",
-"k 	c #4E4EA6",
-"l 	c #5252A8",
-"m 	c #5656AA",
-"n 	c #5A5AAC",
-"o 	c #8787C2",
-"p 	c #8F8FC7",
-"q 	c #5E5EAE",
-"r 	c #8B8BC4",
-"s 	c #8F8FC6",
-"t 	c #9393C8",
-"u 	c #6262B0",
-"v 	c #8E8EC6",
-"w 	c #9292C8",
-"x 	c #9696CA",
-"y 	c #6666B2",
-"z 	c #9A9ACC",
-"A 	c #6A6AB4",
-"B 	c #9E9ECE",
-"C 	c #6565B2",
-"D 	c #6969B4",
-"E 	c #6D6DB6",
-"F 	c #7171B8",
-"G 	c #7575BA",
-"H 	c #9D9DCE",
-"I 	c #A1A1D0",
-"J 	c #7171B7",
-"K 	c #7575B9",
-"L 	c #7979BC",
-"M 	c #7D7DBE",
-"N 	c #8181C0",
-"O 	c #8585C2",
-"P 	c #8989C4",
-"Q 	c #8D8DC6",
-"R 	c #9191C8",
-"S 	c #9595CA",
-"T 	c #9999CC",
-"U 	c #A5A5D2",
-"V 	c #7979BB",
-"W 	c #7D7DBD",
-"X 	c #8181BF",
-"Y 	c #8585C1",
-"Z 	c #8989C3",
-"` 	c #A9A9D4",
-" .	c #8D8DC5",
-"..	c #9191C7",
-"+.	c #9595C9",
-"@.	c #9999CB",
-"#.	c #ADADD6",
-"                                                                ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"    .       .       .       .       .       .       .       .   ",
-"    .       .       .   + + + + + + +       .       .       .   ",
-"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
-"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
-"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
-"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
-"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
-"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
-"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
-"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
-"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
-"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
-"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
-"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
-"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
-"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
-"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
-"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
-"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
-"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
-"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
-"    .       .     + > > Y Z  ...+.@.H > U ` #.#.> + .       .   ",
-"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
-"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
-"    .       .       .       .       .     + > > +   .       .   ",
-"    .       .       .       .       .       + +     .       .   ",
-"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"                                                                ",
-"                                                                "};
diff --git a/community-staging/qpxtool/PKGBUILD b/community-staging/qpxtool/PKGBUILD
deleted file mode 100644
index 47c3e14a3..000000000
--- a/community-staging/qpxtool/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 62654 2012-01-23 09:59:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
-
-pkgname=qpxtool
-pkgver=0.7.1_002
-pkgrel=3
-pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
-arch=('i686' 'x86_64')
-url="http://qpxtool.sourceforge.net/"
-license=('GPL')
-depends=('qt')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	libpng15.patch)
-md5sums=('755321a0196b16d06857550aac74ff50'
-         'ab9af7610277652c77c6d114422b2266')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Fix strict aliasing warnings
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  sed -i 's|lib64|lib|' configure
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
-  make
-  mkdir -p $pkgdir/usr/bin
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/qpxtool/libpng15.patch b/community-staging/qpxtool/libpng15.patch
deleted file mode 100644
index 05e6f49d2..000000000
--- a/community-staging/qpxtool/libpng15.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
---- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp	2009-11-25 10:55:44.000000000 +0300
-+++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp	2012-01-23 13:53:37.000000000 +0400
-@@ -129,28 +129,28 @@
- 
- 	png_read_info(png_ptr, info_ptr);
- 
--	printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+	printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr));
- 
--	if (info_ptr->width != 3744U || info_ptr->height != rows ) {
-+	if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) {
- 		printf("Image should be 3744 x %d", rows);
- 		return 1;
- 	}
- 
--//	width = info_ptr->width;
--//	height = info_ptr->height;
--//	bit_depth = info_ptr->bit_depth;
-+//	width = png_get_image_width(png_ptr, info_ptr);
-+//	height = png_get_image_height(png_ptr, info_ptr);
-+//	bit_depth = png_get_bit_depth(png_ptr, info_ptr);
- 
- 	number_of_passes = png_set_interlace_handling(png_ptr);
- 	png_read_update_info(png_ptr, info_ptr);
- 
--	printf("Color type: [%d] ", info_ptr->color_type);
--	switch (info_ptr->color_type) {
-+	printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
-+	switch (png_get_color_type(png_ptr, info_ptr)) {
- 	    case PNG_COLOR_TYPE_GRAY:
- 			printf("PNG_COLOR_TYPE_GRAY\n");
- 			break;
- 	    case PNG_COLOR_TYPE_PALETTE:
- 			printf("PNG_COLOR_TYPE_PALETTE\n");
--			if (!(info_ptr->valid & PNG_INFO_PLTE)) {
-+			if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE))) {
- 				printf("PNG color type is indexed, but no palette found!");
- 				goto err_read_png;
- 			}
-@@ -168,49 +168,53 @@
- 			printf("unlnown PNG color type!\n");
- 			goto err_read_png;
- 	}
--	printf("Bit depth : %d\n", info_ptr->bit_depth);
--	if (info_ptr->bit_depth != 8) {
-+	printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
-+	if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
- 		printf("Unsupported bit depth!\n");
- 		goto err_read_png;
- 	}
--	if (info_ptr->valid & PNG_INFO_PLTE) {
--		printf("Palette   : %d colors\n", info_ptr->num_palette);
-+
-+	int num_palette;
-+	png_colorp plte;
-+	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
-+	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+		printf("Palette   : %d colors\n", num_palette);
- 	} else {
- 		printf("Palette   : NO\n");
- 	}
--	printf("ROW bytes : %ld\n", info_ptr->rowbytes);
--
-+	printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
- 
- 	raw_row_pointer = buf;
--	png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
-+	png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr));
- 	for (row=0; row<rows; row++) {
- 		if (setjmp(png_jmpbuf(png_ptr))) {
- 			printf("png_jmpbuf failed!\n");
- 			goto err_read_png;
- 		}
- 		png_read_row(png_ptr, png_row_pointer, NULL);
--		if (info_ptr->width < 3744U)
-+		if (png_get_image_width(png_ptr, info_ptr) < 3744U)
- 			memset(raw_row_pointer, 0, 3744);
- 
--		switch (info_ptr->color_type) {
-+		switch (png_get_color_type(png_ptr, info_ptr)) {
- 		    case PNG_COLOR_TYPE_GRAY:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF;
- //					memcpy(raw_row_pointer, png_row_pointer, 3744);
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_PALETTE:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					c = png_row_pointer[col];
--					r = info_ptr->palette[c].red;
--					g = info_ptr->palette[c].green;
--					b = info_ptr->palette[c].blue;
-+					r = plte[c].red;
-+					g = plte[c].green;
-+					b = plte[c].blue;
- 					c = (r*11 + g*16 + b*5) / 32;
- 					raw_row_pointer[col] = c ^ 0xFF;
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*3];
- 					g = png_row_pointer[col*3+1];
- 					b = png_row_pointer[col*3+2];
-@@ -219,7 +223,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*4];
- 					g = png_row_pointer[col*4+1];
- 					b = png_row_pointer[col*4+2];
-@@ -228,7 +232,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_GRAY_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF;
- 				}
- 				break;
diff --git a/community-staging/rawstudio/PKGBUILD b/community-staging/rawstudio/PKGBUILD
deleted file mode 100644
index 479c3bf68..000000000
--- a/community-staging/rawstudio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62658 2012-01-23 11:18:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: cdhotfire <cdhotfire@gmail.com>
-
-pkgname=rawstudio
-pkgver=2.0
-pkgrel=5
-pkgdesc="An open source raw-image converter written in GTK+"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://rawstudio.org/"
-depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
-	 'raptor1' 'lcms' 'gtk2')
-install=${pkgname}.install
-options=('!libtool')
-source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz
-	libpng15.patch)
-md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b'
-         '2f8b7acbe10d8096ce613cbea7986fd3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
-  mkdir $pkgdir/usr/lib/rawstudio
-  mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio
-  ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins
-}
diff --git a/community-staging/rawstudio/libpng15.patch b/community-staging/rawstudio/libpng15.patch
deleted file mode 100644
index 6d3b85968..000000000
--- a/community-staging/rawstudio/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp
---- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp	2011-02-24 01:35:18.000000000 +0300
-+++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp	2012-01-23 15:03:22.000000000 +0400
-@@ -102,8 +102,8 @@
- 	{
- 		*linear_guess = FALSE;
- 		RSColorSpace* profile = NULL;
--		const gchar *icc_profile_title;
--		const gchar *icc_profile;
-+		png_charp icc_profile_title;
-+		png_bytep icc_profile;
- 		guint icc_profile_size;
- 		png_structp png_ptr = png_create_read_struct(
- 				PNG_LIBPNG_VER_STRING,
-@@ -125,11 +125,11 @@
- 
- 					int compression_type;
- 					/* Extract embedded ICC profile */
--					if (info_ptr->valid & PNG_INFO_iCCP)
-+					if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP))
- 					{
- 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
--													(png_charpp) &icc_profile_title, &compression_type,
--													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-+													&icc_profile_title, &compression_type,
-+													&icc_profile, (png_uint_32*) &icc_profile_size);
- 						if (retval != 0)
- 						{
- 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
-diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c
---- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c	2011-03-26 04:52:29.000000000 +0300
-+++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c	2012-01-23 15:04:59.000000000 +0400
-@@ -23,6 +23,7 @@
- #include <gettext.h>
- #include "config.h"
- #include <png.h>
-+#include <zlib.h>
- 
- #define RS_TYPE_PNGFILE (rs_pngfile_type)
- #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
diff --git a/community-staging/rawstudio/rawstudio.install b/community-staging/rawstudio/rawstudio.install
deleted file mode 100644
index 261adb7b4..000000000
--- a/community-staging/rawstudio/rawstudio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q || true
-}
-
-post_upgrade() {
-  update-desktop-database -q || true
-}
-
-post_remove() {
-  update-desktop-database -q || true
-}
diff --git a/community-staging/rawtherapee/PKGBUILD b/community-staging/rawtherapee/PKGBUILD
deleted file mode 100644
index 73eb438d6..000000000
--- a/community-staging/rawtherapee/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 62820 2012-01-27 11:15:07Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
-# Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
-# Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
-# Contributor: Archie <mymaud@gmail.com>
-
-pkgname=rawtherapee
-pkgver=4.0.6
-pkgrel=2
-pkgdesc="RAW photo editor"
-arch=('i686' 'x86_64')
-url="http://www.rawtherapee.com/"
-license=('GPL')
-depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('mercurial' 'cmake')
-install=rawtherapee.install
-source=()
-md5sums=()
-
-_root="https://rawtherapee.googlecode.com/hg/"
-_repo="rawtherapee"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [ -d $_repo ] ; then
-    cd $_repo
-    hg pull
-    hg up "$pkgver"
-    msg "The local files are updated."
-  else
-    hg clone -u "$pkgver" $_root $_repo
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting make..."
-
-  if [ -e "$srcdir/$_repo-build" ]; then
-    rm -rf "$srcdir/$_repo-build"
-  fi
-  mkdir "$srcdir/$_repo-build"
-  cd "$srcdir/$_repo-build"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-     ../$_repo
-  make
-}
-
-package() {
-  cd "$srcdir/$_repo-build"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-staging/rawtherapee/rawtherapee.install b/community-staging/rawtherapee/rawtherapee.install
deleted file mode 100644
index 385eec8f4..000000000
--- a/community-staging/rawtherapee/rawtherapee.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo "update desktop mime database..."
-  update-desktop-database -q
-  update-mime-database usr/share/mime 1>&2 > /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-
-  if [ ${2%%_*} == "3.0a1" ]; then
-    echo "There were lots of changes to the behavior of the majority of tools."
-    echo "This may cause your files to look differently than before."
-  fi
-}
-
-post_remove() {
-  post_install $1
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/remmina-plugins/PKGBUILD b/community-staging/remmina-plugins/PKGBUILD
deleted file mode 100644
index 54e6082f3..000000000
--- a/community-staging/remmina-plugins/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62496 2012-01-20 09:33:49Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=remmina-plugins
-pkgver=0.9.2
-pkgrel=3
-pkgdesc="Remina plugins"
-#"Remmina supports multiple network protocols in an integrated and consistant user interface.
-# Currently RDP, VNC, XDMCP and SSH are supported."
-arch=(i686 x86_64)
-url="http://sourceforge.net/projects/remmina/"
-license=('GPL')
-conflicts=(remmina-plugins-svn)
-depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib)
-makedepends=(intltool pkgconfig gettext perl avahi)
-install=remmina-plugins.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz)
-md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ssh --enable-rdp \
-	--enable-vnc --enable-xdmcp --enable-nx \
-	--enable-telepathy
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/remmina-plugins/remmina-plugins.install b/community-staging/remmina-plugins/remmina-plugins.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-staging/remmina-plugins/remmina-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD
deleted file mode 100644
index d277db4ec..000000000
--- a/community-staging/root/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.00
-pkgrel=3
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
-        'root.sh'
-        'rootd'
-        'root.xml'
-        'fix-mathcore-generation-r42566.diff')
-md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
-         '0e883ad44f99da9bc7c23bc102800b62'
-         'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7'
-         '12877cabd620284f50ea16ef97a54aac')
-
-build() {
-  cd root
-
-  # temporary workaround: remove on next patch release after 5.32.00
-  # bug reported at: https://savannah.cern.ch/bugs/?90906
-  patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff
-
-  if [ ${CARCH} == 'i686' ]; then
-    TARGET=linux;
-  else
-    TARGET=linuxx8664gcc;
-  fi
-
-  msg 'python2 switch'
-  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
-                           -e 's/python -O/python2 -O/g' \
-                           -e 's/python -c/python2 -c/g' -i {} \;
-  sed \
-    -e 's/python 2/python2 2/g' \
-    -i configure
-  sed \
-    -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
-    -i cint/reflex/python/genreflex/Makefile.am
-  sed \
-    -e 's/python /python2 /' \
-    -i config/genreflex.in config/genreflex-rootcint.in
-
-  local sys_libs=""
-  for sys_lib in ftgl freetype glew pcre zlib lzma; do
-    sys_libs+="--disable-builtin-${sys_lib} "
-  done
-  # move from aur if possible
-  #--disable-builtin-afterimage \
-
-  ./configure \
-    ${TARGET} \
-    --prefix=/usr \
-    --enable-gdml \
-    --enable-gsl-shared \
-    --enable-minuit2 \
-    --enable-soversion \
-    --enable-roofit \
-    --enable-python \
-    --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib \
-    ${sys_libs}
-
-  make
-}
-
-package() {
-  cd root
-
-  make DESTDIR=${pkgdir} install
-
-  install -D ${srcdir}/root.sh \
-    ${pkgdir}/etc/profile.d/root.sh
-  install -D ${srcdir}/rootd \
-    ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.xml \
-    ${pkgdir}/usr/share/mime/packages/root.xml
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
-    ${pkgdir}/usr/share/applications/root-system-bin.desktop
-  # replace @prefix@ with /usr for the desktop
-  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
-    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
-  # use a file that pacman can track instead of adding directly to ld.so.conf
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
-  rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community-staging/root/fix-mathcore-generation-r42566.diff b/community-staging/root/fix-mathcore-generation-r42566.diff
deleted file mode 100644
index ae22c23c0..000000000
--- a/community-staging/root/fix-mathcore-generation-r42566.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: cint/cint/src/typedef.cxx
-===================================================================
---- cint/cint/src/typedef.cxx	(revision 42564)
-+++ cint/cint/src/typedef.cxx	(revision 42566)
-@@ -297,18 +297,27 @@
-       }
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strcmp(type1, "::")) {  // FIXME: This makes no sense, there cannot be typedef ::{...};
-+   if (!strcmp(type1, "::")) {
-       // skip a :: without a namespace in front of it (i.e. global namespace!)
-       c = G__fgetspace(); // skip the next ':'
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strncmp(type1, "::", 2)) { // Strip a leading :: (global namespace operator)
--      // A leading '::' causes other typename matching functions to fail so
--      // we remove it. This is not the ideal solution (neither was the one
--      // above since it does not allow for distinction between global
--      // namespace and local namespace) ... but at least it is an improvement
--      // over the current behavior.
--      strcpy((char*)type1, type1 + 2);  // Okay since we reduce the size ...
-+   if (!strncmp(type1, "::", 2)) {
-+      // Strip a leading :: (global namespace operator).
-+      // A leading '::' causes other typename matching
-+      // functions to fail so we remove it. This is not
-+      // the ideal solution (neither is the one above)
-+      // since it does not allow for decriminating between
-+      // global namespace and local namespace, but at
-+      // least it is an improvement over the current
-+      // behavior.
-+      //
-+      // Note: We must use memmove because the source
-+      //       and destination strings overlap!
-+      //
-+      int t1len = strlen(type1);
-+      memmove(type1, type1 + 2, t1len - 2);
-+      type1.Set(t1len - 2, '\0');
-    }
-    while (isspace(c)) {
-       len = strlen(type1);
diff --git a/community-staging/root/root.install b/community-staging/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community-staging/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  update-desktop-database >/dev/null
-
-  update-mime-database /usr/share/mime >/dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
-  # leave for pre 5.30.03-3
-  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
-    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-    mv /tmp/.pacroot etc/ld.so.conf
-    chmod 644 etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community-staging/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
-    export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
-    export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community-staging/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-root">
-    <comment>ROOT file</comment>
-    <comment xml:lang="de">ROOT-Datei</comment>
-    <glob pattern="*.root"/>
-    <magic priority="80">
-      <match value="root" type="string" offset="0:64"/>
-    </magic>
-  </mime-type>
-</mime-info>
diff --git a/community-staging/root/rootd b/community-staging/root/rootd
deleted file mode 100644
index fb2c3388c..000000000
--- a/community-staging/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
-  start)
-  stat_busy "Starting ROOT file server daemon"
-    [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/rootd`
-      echo $PID >/var/run/rootd.pid
-      add_daemon rootd
-      stat_done
-    fi
-    ;;
-  stop)
-  stat_busy "Stopping ROOT file server daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rootd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/sage-mathematics/PKGBUILD b/community-staging/sage-mathematics/PKGBUILD
deleted file mode 100644
index 4b4dff9ad..000000000
--- a/community-staging/sage-mathematics/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Osman Ugus <ugus11@yahoo.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
-
-pkgname=sage-mathematics
-pkgver=4.7.2
-pkgrel=3
-pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
-url='http://www.sagemath.org'
-arch=('i686' 'x86_64')
-license=('GPL')
-#depends=('readline')
-depends=('ppl')
-makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core')
-optdepends=('imagemagick: some plotting functionality benefits from it'
-            'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
-            'sage-mathematics-spkgs: original packages used to build additional packages')
-options=('!makeflags')
-install="${pkgname}.install"
-source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-md5sums=('b3073997e6c7ec00a269f84ff2e54973'
-         'dc391f12b7d17dd37326343ec0e99bbd')
-
-build() {
-  cd sage-${pkgver}
-
-  # modularization of sage, sort of :)
-  # fixes the following error:
-  # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook
-  # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash
-  # this is for people who have custom kernels (sage works this around by checking uname -r)
-  #mkdir -p spkg/installed
-  #touch spkg/installed/readline-6.1
-  mkdir -p spkg/installed
-  touch spkg/installed/ppl-0.11.2
-
-  # fix "missing sage.all error" during build
-  unset CFLAGS
-  unset CXXFLAGS
-
-  # fix build errors
-  unset LDFLAGS
-
-  # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
-  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
-  export MAKE="make -j${SAGE_BUILD_THREADS}"
-
-  # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
-  export SAGE_FORTRAN='/usr/bin/gfortran'
-  export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so'
-
-  # disable building with debugging support
-  export SAGE_DEBUG='no'
-
-  # enable fat binaries (disables processor specific optimizations)
-  # comment out if you're only building it for yourself
-  export SAGE_FAT_BINARY='yes'
-
-  # can't write to root in a clean chroot
-  export DOT_SAGE='/build/src/'
-
-  # only build sage, no documents
-  #make build
-  make
-}
-
-<< COMMENT
-check() {
-  cd sage-${pkgver}
-
-  # uncomment if we want to run all the tests (warning: very long)
-  #make ptestlong
-}
-COMMENT
-
-package() {
-  cd sage-${pkgver}
-
-  # cp because make install is experimental and will corrupt the install
-  install -d ${pkgdir}/opt/sage
-  cp -r * ${pkgdir}/opt/sage
-
-  # move SageTeX files to more appropriate directory
-  install -d ${pkgdir}/usr/share
-  mv ${pkgdir}/opt/sage/local/share/texmf \
-    ${pkgdir}/usr/share
-
-  desktop-file-install ${srcdir}/SAGE-notebook.desktop \
-    --dir ${pkgdir}/usr/share/applications 
-
-  # create link to main binary
-  install -d ${pkgdir}/usr/bin
-  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-
-  # remove build logs
-  rm -f ${pkgdir}/opt/sage/install.log
-  rm -rf ${pkgdir}/opt/sage/spkg/logs
-
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  # no need to package them together, put into sage-mathematics-spkgs
-  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
-  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-}
diff --git a/community-staging/sage-mathematics/SAGE-notebook.desktop b/community-staging/sage-mathematics/SAGE-notebook.desktop
deleted file mode 100644
index 26a35d3ac..000000000
--- a/community-staging/sage-mathematics/SAGE-notebook.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=SAGE
-Comment=SAGE NOTEBOOK
-Comment[en_US]=SAGE NOTEBOOK
-Exec=/opt/sage/sage -notebook
-GenericName=
-GenericName[de]=
-Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
-MimeType=
-Name[de]=SAGE
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;Math;
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-GenericName[en_US]=
diff --git a/community-staging/sage-mathematics/sage-mathematics.install b/community-staging/sage-mathematics/sage-mathematics.install
deleted file mode 100644
index 6caa5299e..000000000
--- a/community-staging/sage-mathematics/sage-mathematics.install
+++ /dev/null
@@ -1,56 +0,0 @@
-post_install() {
-  cd /opt/sage
-
-  # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership
-  # the files it writes to ~/.sage can be safely ignored
-  HOME=/tmp ./sage -c
-
-  # add sagemath user for the daemon
-  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
-
-  # Update LaTeX db to point to SageTeX
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  else
-    echo 'Warning: could not find /usr/bin/texhash'
-    echo 'SageTeX has been installed but you need to run:'
-    echo '# texhash /usr/share/texmf'
-    echo 'So that LaTeX will be able to find it.'
-  fi
-
-echo '
- ___                       
-/ (_)        o            |
-\__   _  _      __        |
-/    / |/ |  | /  \_|   | |
-\___/  |  |_/|/\__/  \_/|/o
-            /|         /|  
-            \|         \|  
- ________________________________ 
-< sage-mathematics, I mean, MOO! >
- -------------------------------- 
-        \   ^__^
-         \  (oo)\_______
-            (__)\       )\/\
-                ||----w |
-                ||     ||
-'
-
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  # Update LaTeX db to remove SageTeX entries
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  fi
-
-  # remove the sagemath daemon user
-  userdel sagemath
-
-  # clean up left overs
-  rm -rf /opt/sage
-}
diff --git a/community-staging/scantailor/PKGBUILD b/community-staging/scantailor/PKGBUILD
deleted file mode 100644
index 32059f4c2..000000000
--- a/community-staging/scantailor/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 62307 2012-01-19 07:47:58Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com>
-
-pkgname=scantailor
-pkgver=0.9.10
-pkgrel=2
-pkgdesc="Interactive post-processing tool for scanned pages"
-arch=(i686 x86_64)
-url="http://scantailor.sourceforge.net"
-license="GPL"
-depends=('qt')
-makedepends=('cmake' 'boost')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('f962c93a2d63b449fa3f6612ade3b028'
-         '0aeb1bae724b5cae208ae8af95e8ed9b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  unset CFLAGS
-  unset CPPFLAGS
-  unset CXXFLAGS
-  patch -p1 <$srcdir/build-fix.patch
-  cmake  .
-  cmake \
-	-DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
-	-DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
-	-DCMAKE_CXX_FLAGS_RELEASE="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_BUILD_TYPE=Release .
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/scantailor/build-fix.patch b/community-staging/scantailor/build-fix.patch
deleted file mode 100644
index 85b620020..000000000
--- a/community-staging/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-staging/scorched3d/PKGBUILD b/community-staging/scorched3d/PKGBUILD
deleted file mode 100644
index 8a481c910..000000000
--- a/community-staging/scorched3d/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Contributor: Seppo Porspakka <sporspak@paju.oulu.fi>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
- 
-pkgname=scorched3d
-pkgver=43.2a
-pkgrel=2
-pkgdesc="A 3d artillery combat game"
-arch=('i686' 'x86_64')
-url="http://www.scorched3d.co.uk/"
-license=('GPL')
-depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils')
-makedepends=('sharutils')
-install=scorched3d.install
-source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.tar.gz"
-        'scorched3d.desktop'
-        'scorched3d.png.uu'
-        'scorched3d-42.1-gcc43.patch'
-        'scorched3d-42.1-fixups.patch'
-        'scorched3d-libpng1.5.patch'
-        'libpng14.patch')
-md5sums=('876de173218fd83a2b0a30255ba694fa'
-         'b951f2150004e10fdff3e6226f1a3939'
-         '178a281333006c6a5a92919865c1d7af'
-         '053769f77a38c252eef1d967b18e93e6'
-         'dfde556559d95bca07c4a390c60790b4'
-         'ec6958191751b5a2c44aa15abfc75269'
-         'c8c03855fd3693122fd39427fa3638c1')
-
-build() {
-  cd scorched
-
-#  patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch
-  patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch
-  patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch
-#  patch -Np0 -i ${srcdir}/libpng14.patch
-
-  WANT_WXGTK=gtk2
-  sh autogen.sh \
-    --prefix=/usr \
-    --datadir=/usr/share/scorched3d \
-    --disable-openaltest \
-    --with-wx-config=wx-config
-
-  #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1
-  #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1
-
-  make
-}
-
-package() {
-  cd scorched
-
-  make DESTDIR=${pkgdir} install
- 
-  # freedesktop stuff - png and desktop file ganked from debian
-  cd ${srcdir}
-
-  uudecode --output-file=scorched3d.png scorched3d.png.uu
-
-  install -D -m644 scorched3d.png \
-      ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png
-  install -D -m644 scorched3d.desktop \
-      ${pkgdir}/usr/share/applications/${pkgname}.desktop
-}
diff --git a/community-staging/scorched3d/libpng14.patch b/community-staging/scorched3d/libpng14.patch
deleted file mode 100644
index 7a5a9434c..000000000
--- a/community-staging/scorched3d/libpng14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/common/image/ImagePng.cpp	2009-02-23 04:14:20.000000000 +0100
-+++ src/common/image/ImagePng.cpp_patched	2010-01-24 22:01:04.000000000 +0100
-@@ -189,7 +189,7 @@
- 	info_ptr = png_create_info_struct(png_ptr);

- 	if (info_ptr == NULL)

- 	{

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

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

- 	  return false;

- 	}

- 

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

- 	{

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

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

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

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

- 	  return false;

- 	}

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

- 	else

- 	{

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

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

- 

- 		Logger::log(S3D::formatStringBuffer(

- 			"Invalid PNG format.\n"

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

- 

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

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

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

- 

- 	/* that's it */

- 	return true;

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

- {

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

--	std::exit(1);

-+	exit(1);

- }

- 

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

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

- typedef unsigned char   BYTE;

- 

--typedef int 	HWND;

-+// typedef int 	HWND;

- typedef void * 	HINSTANCE;

- typedef int 	WPARAM;

- typedef int 	LPARAM;

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

- static void user_png_error(png_structp png_ptr, png_const_charp msg) 

- {

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

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

- }

- 

- static void user_png_warning(png_structp png_ptr, png_const_charp msg) 

---- ./src/client/client/LoadPNG.cpp.old	2011-09-12 12:45:49.167380419 +0200
-+++ ./src/client/client/LoadPNG.cpp	2011-09-12 14:11:14.961772024 +0200
-@@ -28,6 +28,8 @@
- 	int row, i;
- 	volatile int ckey = -1;
- 	png_color_16 *transv;
-+	png_colorp  png_palette;
-+	int         num_palette;
- 
- 	if ( !src ) {
- 		/* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +60,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		error = "Error reading the PNG file.";
- 		goto done;
- 	}
-@@ -127,9 +129,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -137,7 +139,7 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		error = "Out of memory";
- 		goto done;
-@@ -185,12 +187,15 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else {
-+	    	png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+	    	if (num_palette > 0 ) {
-+			palette->ncolors = num_palette; 
-+			for( i=0; i<num_palette; ++i ) {
-+			    palette->colors[i].b = png_palette[i].blue;
-+			    palette->colors[i].g = png_palette[i].green;
-+			    palette->colors[i].r = png_palette[i].red;
-+			}
- 		}
- 	    }
- 	}
diff --git a/community-staging/scorched3d/scorched3d.desktop b/community-staging/scorched3d/scorched3d.desktop
deleted file mode 100644
index b18d86581..000000000
--- a/community-staging/scorched3d/scorched3d.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Exec=/usr/bin/scorched3d
-Icon=scorched3d.png
-Terminal=false
-Name=Scorched 3D
-Name[lt_LT]=Scorched 3D
-Comment=3D artillery game similar to Scorched Earth
-Comment[de_DE]=3D Reimplementation des Klassikers Scorched Earth
-Comment[fr_FR]=un jeu d'artillerie en 3 proche de Scorched Earth
-Comment[lt_LT]=Nuotaikingas 3D taktinis-artilerinis žaidimas, panašus į Scorched Earth
-Comment[pl_PL]=Artyleryjska gra 3D podobna do Scorched Earth
-Comment[ro_RO]=Un joc 3D cu artilerie similar cu Scorched Earth
-Categories=Game;ArcadeGame;
-StartupNotify=true
diff --git a/community-staging/scorched3d/scorched3d.install b/community-staging/scorched3d/scorched3d.install
deleted file mode 100644
index c5571196e..000000000
--- a/community-staging/scorched3d/scorched3d.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community-staging/scorched3d/scorched3d.png.uu b/community-staging/scorched3d/scorched3d.png.uu
deleted file mode 100644
index 4fb7e50db..000000000
--- a/community-staging/scorched3d/scorched3d.png.uu
+++ /dev/null
@@ -1,105 +0,0 @@
-begin 600 scorched3d.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'TP@#%`([XJF@
-M!```$5Q)1$%4>-IEFNER9$>.I3_`W>\2$0PFF5*VI.HJ]58]2\\\W#S/O,*\
-M35LO9FU5U:62E,H4DUM$W+B+.S`__`:3.4.S(!D+G0XX<`"<X_)__O?_<EQ0
-M4R0(D@1M%$3`'35##,1!J:^[.#D;RY)9<@9`4*(H3=.0VH;4)&+3(!IPE-F4
-M;)E<9G(I+'EAR3.S%<P<UO4C2D!0P''<"U@!G\$S:@"*J**J1$0``:T_G/H0
-M'-:W$%Z^1`1$J#\$%<'7CSK@[OBZ(=SK<]8W5U/QZA"0S\NO[SOU\[;^_OE+
-M$;3N;=T#"!%M>%E1``7#7O:LNKY\>5L4$46BH0[!A&(%6RVW[)A:?6`0%2YK
-M7'SLCI9"S`JF%#.*.RZ0<<H7&[_\922@J`*BB`10):I62U0_>]P13.J.RNI>
-M\6JT**@(JG7!((&\+"S%,*_^*Z6P+`N(5+\%K2'AH":H"V%UD;O@)K@[1C7"
-M^"(H$`25@$A`D.K`]1'U$D$JH`(")EJ/4JH7Q1T10500$8(J(20\@,7"HHHL
-MF:64NA$WBF6D*$D4UNW6DW2T1@2H4$Q1##=>@L;7]X-`6/TOJA#J&<H:4((0
-M]8L8D^IAA>*">3U[4\>I[H\2""$14T,0Q=V)*:'SC,PSMAHAHC6DS!&QEVA0
-M<50+N.%:(PRM)VSV*G"L[D/EQ=;Z_!*/4LV-U>2:C+IZ^7)\944<=P=WS)6"
-MDET)*(1(%%!=CQ1A67)%%2`$)28(T590DW630K:P[BJO8`"F@E\,74,UB"`H
-M&@4)6G,7J>'FA8A51`EK=M>-U.R-"*;4V#;'33&4[$*T&L<2`DD5<4$<8A!L
-M=65J'8V@T8G!<0/+PE*$>0DLLR+FB!;4'!.P=3,:(8BNP5?#0M?C,*=^\T*\
-MQ!0&8H*8HC'4.%^-<;P:DF6%6'U!'05B4+2)A`@Q&*(9C87-KE`,<E'ZKCK<
-M#4S@>!2>'H7C(>$.^`(X&@5-]0A4:CU`P"ZG9]6A9H8!<<V=NHB!NN!>$R2(
-M$+7B+\Z*$(*+$E5I4Z!-2A.@:2$V`0V1)<.\*,L26):`E8CDZD$-H(W2=L[U
-MC='VQN%9.1TCF*&QADN%O!6:J;7,N(3R)=F%6%[5*<$1JT>-"BI*#"M<ND(`
-MUYK,0964E*81^@9V^T*W=7*.'`=E6HSC,^1%P0(3B@9!D]/T@=@4NDVFVP%)
-M*2HL4\5J"6L=7C=?S"E2/7XICK:&5OPB]0U$5YA#<6+%6JEP^)(CHDB,A*BT
-MC;#?9YJM8QIX>@Z<#LXX&%(*458(6=N0;$X^*8R*)*7=&+M]H=_!XWU@FI1<
-M!#"L&%B%<A-J&*.X644Z@YA\K7JE(H6JD41H@M)$I0G5@(H4*PY+P`BDY/1]
-M(23C/,!Q"`P'9YX-*]587YL"P0`A6,5`%\6+D*>.%`N;WI$;Y7A23L,*!%JP
-M4M"2U[XH5_A]`14G-E*K8#$C3\Z2'9%(U(@$1UP@:(6PM38Z%5YC*K3=0B[.
-MTX/R\""8%\!>"IJ9X6XKEE=@4%5<:IW)4T..1I.<JRO#$9:L+%EP@Z!>6P>L
-MPO":!W5]B*W68C2;\O[^Q"]/$[NK*Z[W6V[V6][>7K'?);8Q$3#<*RHU<:9I
-M,N[&W9UP.!CC7"MP[2"]'OUZW*I"4"&J$&)$".`!`XX'9YJ,K]_---%IDF(%
-MT$+0@FFI38)'4'`K&`7#B#5?!(F1?=<P+@:>F8:!3WGA<!I(*9%BI$F!)B7Z
-M+G)S#;$7/"GG'%B\QJE?DLXR!J@&0)A+1LQ0@5`J]H-2J+`8)J-I9V)RND8H
-MDZ(.B&.J2-0:B*:89\K:[;XT<R$J7]\HNVW+,&:F;$QYXNE\9ER,;$+3-/1]
-MS_6^PV/"FT@S1QX&R/.E1=;:2VE$-!";%@V1:3Q32J:8,2\%]Z6BC%2T"=$(
-MSX7]WNA:F#0B5F<)%<5"((IBQ2C4&B%`),::H!K8]BU7JB_]M@.+%<[CPG#.
-M#%-A*E#*PFB9/[V?>7A<.#XE^G[+?K^A2Y&NV=!WB7[;TVXVI)0HR\PTCIR'
-M,X?G`]-T)N<9UT((D%R8BX,**0EHPB0"L9Z`2VWL&JM-GH!BQ*YI$8$8(Q)J
-M@K$F]6*&B-'UB7Z[XYONBBRU"]W?9H[#3&H6NL98EL+3X<Q_?+RCY$R*@=W5
-MCNUN0]]W-*&V&FZ.F3-.QFD8&<Y';FYZWGV]HW@M5AZ@2*`00`*N^C*;!(6H
-MBJMB"'';M?4$0FVNBCMYSLQ+8<R9C-%N-ER]N>7FJ^\(38L$H]^>&2?C]@8>
-M[T=^?O\K?_CC#_SSO_X'#P_/F#G]IF.WW;#;;=AO.KJVI>LZ=KLM<\X<CD?N
-M/]WS=_(5[][=@$1$"Q(<-.$2L,M4L#:A(=0V0Z2B86S;ME8_58IY+1X8(DK3
-M=%R_N66SOZ'=7)$-IF%"-=,T`^)*TH:^ZYCGS*]W#WRZ>^+A\8EY69B73(R)
-MON^XOM[1Q$@,@;9-A)1`A.D\<7.S9YH:;F[?L-TY_::PW22PPCS/Y)()XH10
-M>R\3(XH3)!!I4^TWO-8#1`A-H&EZ9@+/H_/+TZ^<AI\XG4=4A>TF\NUWT'4=
-ML"7/&VZNKOAOO_];MEW'X],3A].)^\<#3\\GSN/,D@OC.%.6"K.I;>C[CDW7
-M`PFC(<:.%`,BA7DVAK,Q34Z,@IHCJ>9+$"?%.IM$"^O@D2&;D;,S%6?RP'')
-M_/CA$S_]_)$/'SYQGB:ZKN7F9LOW'UO>OMVQV>[QY0U-ZOB;WW[';[[]FF$<
-M:W@\///^PR<^WCTPG$>.AX'#X<0PG"C+@K>)_7[+]9LW['8W;+:WI#;@S#P?
-M'_CT,#%/$U>;!%V=RV-R0@()0A`EEIPKG!D,T\3=_9%_^_,=[^^>^7C_Q(>/
-M=QP.)Y:<Z=J6INOH?TG\_![>WD:VFX['QQU]=\6;-UNNMCW;7<]NN^'W?_<[
-M_LO??\^2"Z?AS/W]$[]^NN?CW0/G822&P&^__VO^Z;__(__T/_XGUV^_I6V=
-MP^%7'I_>\_[GCYS/`U]]=<N;ZXZ=)'I;$#=B,E0A+N?I90X=AH%?'Q[Y]S_^
-MP(>[9TZG,\=A8)XSYHZ&B$\S9H5E<8H)U_LSQ^/`I\<G?OJEI>NJ4=MMSWZW
-MH>M:FB;1Q$A*@6_^ZBN^_NH6`5*,7%WMN;W>$.5$TA^Y^S#PGW_ZP,/])Z9I
-M).?,\^&XSI4]NNG0:&A9R,M$'`]CG2_%.9T&'IX.O/]PQ]/S@`!=DP@Q4@Q"
-M#&BHY78<A6%PNKX0NY'#_<C#IPJ#(0@I**E)M&W#MN^X?;/G]LV>FYL]-]=7
-M;'<;NK:MU;:<.#[_F9AF_O*G1_[M7QXX'L]`(47E/$W(40DA$%,/ZDQS85YF
-MXO/3<VU&W7@^C8SGJ<96C!6V5`GF9*O]#-0FS0W&T3B=X/9MY&H'TRB<S[(2
-M4,*2"Z6,G,\3]T\'XH^_$&.@:Q)-T]+W+5^_W?&/_[#'PXY?'S?<?RJH))QQ
-MG4F$B)*7S.%P1*/R^&3,XYEE?B(^'0XU!XHQC#-YFHCJJ$#.1EXR2UF+&J_H
-M%73-'2%%IVV$OWJG/#XIX]E9%BB7YFBE$30(JL()Z+K`DB,I/?*'/[=\^-0Q
-MCALVW1NNMGMN;ZY9ELPT+XQSQLV9Y\S=W0,/#\\<#@?>W2;BTVFH\V1VQCE#
-MSEQU$2N%\Y0Y#3/C-'.><QWY@A""$C0PC<HX"%C@W3ME?ZVXURE[,*&XKD8(
-M(01"K".EN-$T1MLNY#+PPX_.\03G4\/O_OHW_/[O$^_>WM!WPC@OR'DB+POS
-M-//IXSU_^<M[#H<#5]TWQ-D,'$JNA.*V;_FOO_V*XL8P+?SQIWO^\Y<'GHY#
-M'3M+S2>7.GHJPFF(W#TH^^O`M]\$=E>![29@IDRSDK.2&EM[+MANG1AK-1U'
-MY7!0#@<P,W[X\0/'X\`_?/\=W__N.[YY=TLV>'X^\O/[C_ST\Z_<W3\B7LCC
-M3-1X804*%".XT,?*S*4F\NU7UPQSYCQGAO-<*_7:WQM0W+$Y,Q?A/"TL<Z!K
-M`TU2N@YP!8^D%'$32A&F43@599Z$G(5I$J:YLGXY9^9YP;)QGA:^GQ?^]F]^
-MP]PFBM7^:9XS;81ESL38=+4"ATQ>,B67VG"Y(P%NWNSX=BG,Q;B[/S%-"VY.
-M4&$Q8RX%S"C%&$[.<#2:F.EZX?K:2#'4ZJJ)4I1Y%MR5\ZA,XTJ=K+FANB;_
-MLO##./-\''@^#ESO-PSCS-/SB6G)B$`*0LZ%V&S:RJ0MB@D4@&R44LA6F>#;
-MZRTI!6ZN=QQ/(^-8Q\AA'!G.4^5ZO!+!>5DP<X;!&0;08*@:*C/%:F*+*#$$
-M8HBDF.C:1*.ALH%4DM<\\_C\Q/D/`Z?SB7DN/#T-Y#FSZ1*[7A"\AI!8_:/@
-MCKD`I?:`7CG*E!+;+4A0=IN6>2[D8LS+PC3/S'.IW>N<.9U&2JD$^9*-I13*
-M4GOXRE`Z3J$$)ZLQ+IEIF9F;R*9OB1>F3VMOEJ>9GW[^6!$Q&UT3V/21W2Y"
-M$*(2,'5$`R$X'E^Q7^Z4XH@Z(00V?4O7-!1SW&SUE#&."^<Q<SK//+>)G(UB
-MQI07AO/,.&52N-#ISIP+[E8I^>Q,,TQS1,3INY96$U$J+6_NG,\CI3@A*&VC
-M;#?*9I-`A;B"T$42X44L62EWC8JZ(U[YF(Q3IUTJ>Q8"_2[0]<Y^W_'UVQTY
-M&U/.#,/$\7CF-,RX5*1;E@SC1"DK*@4A%Z<8/)TFIL78M(5MW]$VL0HL"DF$
-MO@F\O>G8;!*ZTMIQ\4J'9RN4]6%8A<D+'Q650*!(C>E@QDH\X.*KW%1;B)`@
-MF1-SI$V13=^PS+ERI-E8EH5AG%B6\D*YG*?,>39$E9@:NKYCLVE0$8H9082^
-MB[RYZMCU+3&N6AU2#<"=[%:%":P.VJN'-2A10%01C^B*.!5\:JBLN@SF==!&
-MI`I^*;+9M)7/S%"*D4MF7!:6N9"7VL^<QIEA*D!DN^VXWK7LNE!/<BJH*M=7
-M#;?7'6U*5.G!7Y&[%_5!0A4X*E6-F%<!8I6!"I=-&-E6AMB,[%`L5RIEG7O=
-M#,OE)1Z5VL-'E&Z3UC7!<F$I1BZ5J&I2H&N4)@AF3C80=YHHI*B5`O)5Z`-B
-M2DT=XD4H6A!3I!AJ!<>1U0!<JEY0?%W8<;>7WW.)%,_5J%)'TZPU67&'^#F_
-M*O$LE6>W"X-WD5J=L(9E")!6-2JL%&NEBFJ3!T+LNPYW(^=:&'(NF&3<9>7;
-M/U/OH+A66348+SQE-J.40+:`6<:+48JS6*@<Y\J_OBQS>;*"1JC'ACI5HBJE
-MDF(X0==18'T`*R>T)O%^+633HLS+PJ(+12^48)W4[.6?VPM-:PJR2DEZT6*+
-M5_980(*!*69RV?]GA*L#R.?7W/%2_^>*"%32I"JD]H5:#*]-BGV;,#/$"V(%
-M<2&[D!%RJ8N;5;$NNU&\4H>.UUCTSYLP').:U'43CE"5%7^M=2,O^@54`UT"
-ME`H"KK7*5CG%7B1L6?6!U^Z(30R8"::*ARH!N=22CJ_)N,;Y;)EL3G%J;%?M
-MLDY5Z^+FSJNMO4C5_D74^"L1>\6/VK54[<'7JP9NM2NX2/W.NL%7!JRD5Q7C
-MRN<XN\1/A<I"MK*BSF>-BE>W%'3UV/^SM?__KL(7*2#82W)X#9MU"E,#\:I\
-M:CW;SU</UIQQA^A>U@0J-6FH@&$B>!!LI?N*5W2HWO*UT-466%]YV\)%<UL_
-MJZOZN?96_OI.A=L7]R1>3E16+<U7]5JK(7[)!G<PIY@3W3)NAE@AK)ML%`C5
-M=J$FEB`448HXQ5=5'WFY3E"/=I6"ULVY7&*\>KIVK:MH9Q7WY8M(NNC5*P^Z
-M$KK$]?4+CEDMNFI&).=U54/<JI>3U.9.A$:5%)0EE/4^Q.OCKWY7>Y7,:^R:
-MKW<GW&N..36??*TCE_!YC3#VZCZ&U@L*0:HX&%;9%;<J<'AM>?XO+.\[U&WH
-.P#``````245.1*Y"8((`
-`
-end
diff --git a/community-staging/scummvm-tools/PKGBUILD b/community-staging/scummvm-tools/PKGBUILD
deleted file mode 100644
index 460708a4d..000000000
--- a/community-staging/scummvm-tools/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 62446 2012-01-20 06:47:00Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jérémie Dimino <jeremie@dimino.org>
-# Contributor: Sebastian Hase <sebastian_hase@gmx.de>
-# Contributor: Joe Davison <joe@thosedamnpeanuts.com>
-pkgname=scummvm-tools
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM"
-url="http://www.scummvm.org/"
-license=('GPL')
-depends=('libpng' 'wxgtk' 'flac' 'libvorbis')
-arch=('i686' 'x86_64')
-source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz)
-md5sums=('43cbf9f5c4939876cf4149dd59e68044')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  install -d ${pkgdir}/usr/bin
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -Dm 644 README ${pkgdir}/usr/share/doc/scummvm-tools/README
-  install -Dm 644 convert_dxa.sh ${pkgdir}/usr/share/doc/scummvm-tools/samples/convert_dxa.sh
-}
-#vim: sw=2 ts=2 et:
diff --git a/community-staging/silly/PKGBUILD b/community-staging/silly/PKGBUILD
deleted file mode 100644
index 6c096d54c..000000000
--- a/community-staging/silly/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 62458 2012-01-20 07:15:00Z svenstaro $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
-
-pkgname=silly
-pkgver=0.1.0
-pkgrel=5
-pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project"
-arch=('i686' 'x86_64')
-url="http://www.cegui.org.uk/wiki/index.php/SILLY"
-license=('MIT')
-depends=('libjpeg' 'libpng' 'gcc-libs')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz
-        silly-libpng1.5.patch)
-md5sums=('c3721547fced7792a36ffc9ce6ec23fd'
-         '530551c2942aea6fa20f10d06f1e604f')
-
-build() {
-  cd "${srcdir}/SILLY-${pkgver}"
-  patch -Np1 < $srcdir/silly-libpng1.5.patch
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/community-staging/silly/silly-libpng1.5.patch b/community-staging/silly/silly-libpng1.5.patch
deleted file mode 100644
index 0b2d27252..000000000
--- a/community-staging/silly/silly-libpng1.5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-ILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp
---- SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~    2006-06-19 00:42:12.000000000 +0200
-+++ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp 2011-12-06 14:38:31.738251526 +0100
-@@ -64,10 +64,7 @@ void PNG_error_function(png_structp png_
-                         png_const_charp error)
- {
-     //  printf("PNG Error: %s\n", error);
--    // copied from libpng's pngerror.cpp
--    jmp_buf buf;
--    memcpy(buf, png_ptr->jmpbuf, sizeof(jmp_buf));
--    longjmp(buf, 1);
-+    png_longjmp(png_ptr, 1);
- }
-
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD
deleted file mode 100644
index cef809f8a..000000000
--- a/community-staging/smc/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 62870 2012-01-28 06:06:11Z ebelanger $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=14
-pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
-url="http://www.secretmaryo.org/"
-license=('GPL3')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
-makedepends=('autoconf' 'automake' 'boost')
-source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
-        smc-for-cegui-v0-7.diff
-        smc.desktop
-        smc.png)
-md5sums=('75ab7826303c49aec25b052a8b90287f'
-         '51dfea21b741ad19df14e738df52f1cf'
-         '80fe208132ff41dd7677a53ee429ecdb'
-         'efca7580e28748625eb676c9d24ee122')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # to remove when smc will be compatible with cegui-0.7.x
-  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
-  # fix for boost-1.46
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  ./autogen.sh
-  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir"
-  # install some freedesktop.org compatibility
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -rf "$pkgdir/usr/share/smc/"
-}
diff --git a/community-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/speed-dreams/PKGBUILD b/community-staging/speed-dreams/PKGBUILD
deleted file mode 100644
index 3fdf875d9..000000000
--- a/community-staging/speed-dreams/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 62456 2012-01-20 07:08:15Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
-# Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
-pkgname=speed-dreams
-pkgver=2.0.0b1
-_pkgver=2.0.0-b1-r3937
-pkgrel=2
-pkgdesc="A racing simulator with rich graphics and physics"
-arch=('i686' 'x86_64')
-url="http://speed-dreams.sourceforge.net/"
-license=('GPL2')
-depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data')
-makedepends=('cmake' 'p7zip')
-noextract=(${pkgname}-${_pkgver}-src.tar.7z)
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z"
-        "${pkgname}.desktop")
-md5sums=('5299fe23aec3641827039ae3c69de460'
-         '6b45e9c40984ebb79a1dfaddbfabde92')
-
-build() {
-  7z x ${pkgname}-${_pkgver}-src.tar.7z
-  tar xf ${pkgname}-${_pkgver}-src.tar
-
-  cd "${pkgname}-${_pkgver}-src"
-
-  cmake . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSD_BINDIR=/usr/bin \
-    -DSD_DATADIR=/usr/share/speed-dreams-2 \
-    -DSD_LIBDIR=/usr/lib/speed-dreams-2 \
-    -DOPTION_OFFICIAL_ONLY:BOOL=ON
-
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${_pkgver}-src"
-  
-  make DESTDIR="${pkgdir}/" install
-
-  rm -r "${pkgdir}/usr/share"
-
-  install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png"
-  install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop"
-
-  mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r doc/* "${pkgdir}/usr/share/doc/${pkgname}/"
-  rm -r "${pkgdir}/usr/share/doc/${pkgname}/man"
-
-  mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}"
-  cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}"
-
-  # Symlink for backwards compatibility
-  cd "${pkgdir}/usr/bin"
-  ln -s speed-dreams-2 speed-dreams
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/speed-dreams/speed-dreams.desktop b/community-staging/speed-dreams/speed-dreams.desktop
deleted file mode 100644
index f04b71791..000000000
--- a/community-staging/speed-dreams/speed-dreams.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Speed Dreams
-Comment=The Open Racing Car Simulator Fork
-Exec=speed-dreams-2
-Icon=speed-dreams.svg
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community-staging/synfig/PKGBUILD b/community-staging/synfig/PKGBUILD
deleted file mode 100644
index 2c33e315f..000000000
--- a/community-staging/synfig/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 62498 2012-01-20 09:34:35Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Franco Iacomella <yaco@gnu.org>
-
-pkgname=synfig
-pkgver=0.63.03
-pkgrel=2
-pkgdesc="Professional vector animation program (CLI renderer only)"
-arch=(i686 x86_64)
-url="http://synfig.org"
-license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng'
-	 'libtiff' 'libdv' 'libmng')
-optdepends=('openexr' 'libsigc++')
-conflicts=('synfig-core')
-replaces=('synfig-core')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
-	build-fix.patch
-	ffmpeg-0.8.patch)
-md5sums=('9bd77cd2fc2381adfbd50a7b9c1c6e7c'
-         'b5568b06fae1a7ee465b5380b1139b83'
-         'ebf41046097cfd778dee9a9854561dae')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
-  [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
-  patch -p1 -i $srcdir/build-fix.patch
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/synfig/build-fix.patch b/community-staging/synfig/build-fix.patch
deleted file mode 100644
index be45fdc68..000000000
--- a/community-staging/synfig/build-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-05 13:04:07.000000000 +0400
-+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-14 14:32:49.000000000 +0400
-@@ -31,6 +31,10 @@
- #	include <config.h>
- #endif
- 
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #include "trgt_av.h"
- 
- extern "C"
-@@ -116,14 +120,14 @@
-     picture = avcodec_alloc_frame();
-     if (!picture)
-         return NULL;
--    size = avpicture_get_size(pix_fmt, width, height);
-+    size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
-     picture_buf = (uint8_t *)malloc(size);
-     if (!picture_buf) {
-         av_free(picture);
-         return NULL;
-     }
-     avpicture_fill((AVPicture *)picture, picture_buf,
--                   pix_fmt, width, height);
-+                   (enum ::PixelFormat)pix_fmt, width, height);
-     return picture;
- }
- 
diff --git a/community-staging/synfig/ffmpeg-0.8.patch b/community-staging/synfig/ffmpeg-0.8.patch
deleted file mode 100644
index 4ba40fff2..000000000
--- a/community-staging/synfig/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp	2011-09-29 10:51:41.000000000 +0200
-+++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp	2011-10-31 16:39:03.000000000 +0100
-@@ -441,7 +441,7 @@
- 		if( context->coded_frame )
- 			pkt.pts = context->coded_frame->pts;
- 		if( context->coded_frame && context->coded_frame->key_frame)
--			pkt.flags |= PKT_FLAG_KEY;
-+			pkt.flags |= AV_PKT_FLAG_KEY;
- 
- 		//kluge for raw picture format (they said they'd fix)
- 		if (formatc->oformat->flags & AVFMT_RAWPICTURE)
-@@ -463,7 +463,7 @@
- 				if( context->coded_frame )
- 					pkt.pts = context->coded_frame->pts;
- 				if( context->coded_frame && context->coded_frame->key_frame)
--					pkt.flags |= PKT_FLAG_KEY;
-+					pkt.flags |= AV_PKT_FLAG_KEY;
- 
- 				ret = av_write_frame(formatc, &pkt);
- 
-@@ -567,17 +567,17 @@
- 		if (typestring)
- 		{
- 			//formatptr guess_format(type, filename, MIME type)
--			format = guess_format(typestring,NULL,NULL);
-+			format = av_guess_format(typestring,NULL,NULL);
- 		}
- 		else
- 		{
--			format = guess_format(NULL, filename, NULL);
-+			format = av_guess_format(NULL, filename, NULL);
- 		}
- 
- 		if(!format)
- 		{
- 			synfig::warning("Unable to Guess the output, defaulting to mpeg");
--			format = guess_format("mpeg", NULL, NULL);
-+			format = av_guess_format("mpeg", NULL, NULL);
- 		}
- 
- 		if(!format)
-@@ -753,7 +753,7 @@
- 
- 		context = st->codec;
- 		context->codec_id = (CodecID)codec_id;
--		context->codec_type = CODEC_TYPE_VIDEO;
-+		context->codec_type = AVMEDIA_TYPE_VIDEO;
- 
- 		//PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???)
- 
-@@ -800,7 +800,7 @@
- 
- 		context = stream->codec;
- 		context->codec_id = (CodecID)codec_id;
--		context->codec_type = CODEC_TYPE_AUDIO;
-+		context->codec_type = AVMEDIA_TYPE_AUDIO;
- 
- 		/* put sample parameters */
- 		context->bit_rate = 64000;
diff --git a/community-staging/ted/PKGBUILD b/community-staging/ted/PKGBUILD
deleted file mode 100644
index 2a1c79b5d..000000000
--- a/community-staging/ted/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62907 2012-01-29 01:30:55Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=ted
-pkgver=2.21
-pkgrel=4
-pkgdesc="An easy rich text processor (with footnote support)"
-arch=('i686' 'x86_64')
-url="http://www.nllgg.nl/Ted/"
-depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
-license=('GPL')
-source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz 
-        ted-2.21-libpng15.patch)
-md5sums=('34ae855938a3b364eb587cca504ba356'
-         '0c339b0fa7aec6b150e07e9027cd360c')
-
-build() {
-  cd "$srcdir/Ted-$pkgver"
-  sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
-  patch -p0 -i ../ted-2.21-libpng15.patch
-  make compile.shared
-  make package.shared
-}
-
-package() {
-  cd "$srcdir/Ted-$pkgver"
-  mkdir -p "$pkgdir/usr/share/"
-  cd "$pkgdir/usr/share/"
-  tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
-  mv bin ../
-  mkdir -p "$pkgdir/usr/share/man/man1"
-  cd "$pkgdir/usr/share/Ted/"
-  mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
-  sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
-  mv *.sh "$pkgdir/usr/bin/"
-}
diff --git a/community-staging/ted/ted-2.21-libpng15.patch b/community-staging/ted/ted-2.21-libpng15.patch
deleted file mode 100644
index afd30f9a4..000000000
--- a/community-staging/ted/ted-2.21-libpng15.patch
+++ /dev/null
@@ -1,423 +0,0 @@
-This patch is from netbsd pkgsrc
-
-ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
-
---- bitmap/bmpng.c
-+++ bitmap/bmpng.c
-@@ -20,23 +20,32 @@
- /*									*/
- /************************************************************************/
- 
--static int bpPngiToBitmap(	const png_info *		pngi,
-+static int bpPngiToBitmap(	const png_structp		pngp,
-+				png_info *			pngi,
- 				BitmapDescription *		bd )
-     {
-     unsigned int	col;
-+    png_uint_32		res_x, res_y;
-+    int			unit_type= 0;
- 
--    bd->bdPixelsWide= pngi->width;
--    bd->bdPixelsHigh= pngi->height;
-+    bd->bdPixelsWide= png_get_image_width( pngp, pngi );
-+    bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
-     bd->bdHasAlpha= 0;
- 
--    switch( pngi->color_type )
-+    switch( png_get_color_type( pngp, pngi ) )
- 	{
- 	case PNG_COLOR_TYPE_PALETTE:
-+	    {
-+	    int		num_palette;
-+	    png_colorp	palette;
-+
-+	    png_get_PLTE( pngp, pngi, &palette, &num_palette );
-+
- 	    bd->bdColorEncoding= BMcoRGB8PALETTE;
--	    bd->bdColorCount= pngi->num_palette;
-+	    bd->bdColorCount= num_palette;
- 	    bd->bdBitsPerSample= 8;
- 	    bd->bdSamplesPerPixel= 3;
--	    bd->bdBitsPerPixel= pngi->bit_depth;
-+	    bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
- 
- 	    bd->bdRGB8Palette= (RGB8Color *)
- 				malloc( bd->bdColorCount* sizeof(RGB8Color) );
-@@ -46,47 +55,51 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	    for ( col= 0; col < bd->bdColorCount; col++ )
- 		{
--		bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
--		bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
--		bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
-+		bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
-+		bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
-+		bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
- 		bd->bdRGB8Palette[col].rgb8Alpha= 0;
- 		}
-+	    }
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB:
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY:
- 	    bd->bdColorEncoding= BMcoWHITEBLACK;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB_ALPHA:
- 	    bd->bdHasAlpha= 1;
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY_ALPHA:
- 	    bd->bdHasAlpha= 1;
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 
- 	default:
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 	}
- 
--    bd->bdBytesPerRow= pngi->rowbytes;
-+    bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
-     bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
- 
--    switch( pngi->phys_unit_type )
-+    if  ( !  png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
-+	{ unit_type= PNG_RESOLUTION_UNKNOWN;	}
-+
-+    switch( unit_type )
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
- 	    bd->bdUnit= BMunPIXEL;
-@@ -96,12 +109,12 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	case PNG_RESOLUTION_METER:
- 	    bd->bdUnit= BMunM;
--	    bd->bdXResolution= pngi->x_pixels_per_unit;
--	    bd->bdYResolution= pngi->y_pixels_per_unit;
-+	    bd->bdXResolution= res_x;
-+	    bd->bdYResolution= res_y;
- 	    break;
- 
- 	default:
--	    LDEB(pngi->phys_unit_type);
-+	    LDEB(unit_type);
- 	    return -1;
- 	}
- 
-@@ -119,11 +132,11 @@ static int bmPngReadContents(	png_info *
-     unsigned char *		buffer;
- 
-     numberOfPasses= 1;
--    if  ( pngi->interlace_type )
-+    if  ( png_get_interlace_type( png, pngi ) )
- 	{ numberOfPasses= png_set_interlace_handling( png ); }
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  pngi->bit_depth == 16				)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  png_get_bit_depth( png, pngi ) == 16			)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -133,9 +146,6 @@ static int bmPngReadContents(	png_info *
- 	}
- 
-     png_start_read_image( png );
--    /*
--    png_read_update_info( png, pngi );
--    */
- 
-     buffer= (unsigned char *)malloc( bd->bdBufferLength );
-     if  ( ! buffer )
-@@ -236,9 +246,9 @@ int bmPngReadPng(	BitmapDescription *	bd
- 
-     png_read_info( pngp, pngip );
- 
--    if  ( bpPngiToBitmap( pngip, bd ) )
-+    if  ( bpPngiToBitmap( pngp, pngip, bd ) )
- 	{
--	LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); 
-+	LLDEB(bd->bdColorCount,bd->bdRGB8Palette); 
- 	png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
- 	return -1;
- 	}
-@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
- 
- static int bpPngiFromBitmap(	png_structp			png,
- 				png_info *			pngi,
-+				png_colorp *			pPalette,
- 				const BitmapDescription *       bd )
-     {
--    png_info_init( pngi );
--    pngi->width= bd->bdPixelsWide;
--    pngi->height= bd->bdPixelsHigh;
-+    int			bit_depth;
-+    int			color_type;
-+    png_color_8		sig_bit;
- 
-     switch( bd->bdUnit )
- 	{
- 	case BMunM:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= bd->bdXResolution;
--	    pngi->y_pixels_per_unit= bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    bd->bdXResolution,
-+			    bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunINCH:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
--	    pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    (int)( 39.37* bd->bdXResolution ),
-+			    (int)( 39.37* bd->bdYResolution ),
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPOINT:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
--	    pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    POINTS_PER_M* bd->bdXResolution,
-+			    POINTS_PER_M* bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPIXEL:
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
--	    pngi->x_pixels_per_unit= 1;
--	    pngi->y_pixels_per_unit= 1;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 
- 	default:
- 	    LDEB(bd->bdUnit);
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 	}
- 
-@@ -329,41 +338,48 @@ static int bpPngiFromBitmap(	png_structp
- 
- 	case BMcoBLACKWHITE:
- 	case BMcoWHITEBLACK:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
-+	    bit_depth= bd->bdBitsPerPixel;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_GRAY;	}
--	    pngi->sig_bit.gray= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_GRAY;		}
-+	    sig_bit.gray= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB:
--	    pngi->bit_depth= bd->bdBitsPerSample;
-+	    bit_depth= bd->bdBitsPerSample;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_RGB;		}
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_RGB;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB8PALETTE:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
--	    pngi->color_type= PNG_COLOR_TYPE_PALETTE;
-+	    bit_depth= bd->bdBitsPerPixel;
-+	    color_type= PNG_COLOR_TYPE_PALETTE;
- 
--	    pngi->valid |= PNG_INFO_PLTE;
--	    pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
--	    if  ( ! pngi->palette )
--		{ XDEB(pngi->palette); return -1;	}
--	    pngi->num_palette= bd->bdColorCount;
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
--	    for ( i= 0; i < pngi->num_palette; i++ )
-+	    if  ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
- 		{
--		pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
--		pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
--		pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
-+		return -1;
- 		}
-+
-+	    *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
-+						    sizeof( png_color ) );
-+	    if  ( ! *pPalette )
-+		{ XDEB(*pPalette); return -1;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
-+	    for ( i= 0; i < bd->bdColorCount; i++ )
-+		{
-+		(*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
-+		(*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
-+		(*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		}
-+
-+	    png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
- 	    break;
- 
- 	default:
-@@ -371,7 +387,13 @@ static int bpPngiFromBitmap(	png_structp
- 	    return -1;
- 	}
- 
--    pngi->interlace_type= 0;
-+    png_set_sBIT( png, pngi, &sig_bit );
-+    png_set_IHDR( png, pngi,
-+			bd->bdPixelsWide, bd->bdPixelsHigh,
-+			bit_depth, color_type,
-+			PNG_INTERLACE_NONE,
-+			PNG_COMPRESSION_TYPE_BASE,
-+			PNG_FILTER_TYPE_BASE );
- 
-     return 0;
-     }
-@@ -395,8 +417,8 @@ static void bmPngWriteContents(	png_stru
- 	    }
- 	}
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  bd->bdBitsPerSample == 16			)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  bd->bdBitsPerSample == 16				)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -431,9 +453,9 @@ static void bmPngWriteContents(	png_stru
- 	    from= scratch;
- 	    }
- 
--	if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	      bd->bdBitsPerSample == 16			&&
--	      scratch					)
-+	if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	      bd->bdBitsPerSample == 16					&&
-+	      scratch							)
- 	    {
- 	    int			col;
- 	    const BmUint16 *	fr= (const BmUint16 *)from;
-@@ -453,10 +475,6 @@ static void bmPngWriteContents(	png_stru
- 
-     png_write_end( png, pngi );
- 
--    if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	  pngi->palette					)
--	{ free( pngi->palette );	}
--
-     if  ( scratch )
- 	{ free( scratch );	}
- 
-@@ -510,50 +528,43 @@ int bmPngWritePng(		const BitmapDescript
- 				const unsigned char *		buffer,
- 				SimpleOutputStream *		sos )
-     {
-+    int			rval= 0;
-     png_structp		pngp= (png_structp)0;
-     png_infop		pngip= (png_infop)0;
-+    png_colorp		palette= (png_colorp)0;
- 
-     pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
- 				    (png_error_ptr)0, (png_error_ptr)0 );
-     if  ( ! pngp )
--	{ LDEB(1); return -1;	}
-+	{ XDEB(pngp); rval= -1; goto ready;	}
- 
-     pngip = png_create_info_struct( pngp );
-     if  ( ! pngip )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, (png_infop *)0 );
--	return -1;
--	}
-+	{ XDEB(pngip); rval= -1; goto ready;	}
-+
-+    /*
-+    As the info struct is built by libpng this is not needed:
-+    (The call will disappear from libpng in version 1.4)
-+    png_info_init( pngi ); 
-+    */
- 
-     if  ( setjmp( png_jmpbuf( pngp ) ) )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, &pngip );
--	/*  Crashes:
--	if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	      pngip->palette				)
--	    { free( pngip->palette );	}
--	*/
--	return -1;
--	}
-+	{ LDEB(1); rval= -1; goto ready;	}
- 
-     png_init_io( pngp, (FILE *)0 );
-     png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
- 
--    if  ( bpPngiFromBitmap( pngp, pngip, bd ) )
--	{
--	LDEB(bd->bdColorEncoding);
--	png_destroy_write_struct( &pngp, &pngip );
--	return -1;
--	}
--
--    /*
--    png_write_info( pngp, pngip );
--    */
-+    if  ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
-+	{ LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
- 
-     bmPngWriteContents( pngp, pngip, buffer, bd );
- 
-+  ready:
-+
-+    if  ( palette )
-+	{ free( palette );	}
-+
-     png_destroy_write_struct( &pngp, &pngip );
--    return 0;
-+
-+    return rval;
-     }
diff --git a/community-staging/tmw/PKGBUILD b/community-staging/tmw/PKGBUILD
deleted file mode 100644
index cc33a0a2d..000000000
--- a/community-staging/tmw/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 62980 2012-01-29 22:37:04Z ebelanger $
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=tmw
-pkgver=0.5.2
-pkgrel=2
-pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
-arch=('i686' 'x86_64')
-url="http://themanaworld.org"
-license=('GPL')
-depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' 
-'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf')
-makedepends=('cmake' 'mesa')
-source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2)
-md5sums=('c843ef420aced82db1e51fa14e80174a')
-
-build() {
-    cd "$srcdir"
-    cmake . -DCMAKE_INSTALL_PREFIX=/usr
-    make
-}
-
-package() {
-    cd "$srcdir"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/torcs/PKGBUILD b/community-staging/torcs/PKGBUILD
deleted file mode 100644
index b8bd4a905..000000000
--- a/community-staging/torcs/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62730 2012-01-25 09:04:37Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=torcs
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="A 3D racing cars simulator using OpenGL"
-url="http://torcs.sourceforge.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis')
-makedepends=('plib')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2
-        torcs.desktop
-        torcs-gcc.patch)
-md5sums=('254b8f4c14d067dd63da8d54d3cfdba8'
-         '328e419e9f985c3e7b69924fe299330d'
-         '5ae7e903df37300d3b8744328c756bff')
-
-build() {
-  cd $srcdir/$pkgname-${pkgver/_/-}
-  unset LDFLAGS
-  ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib
-  make
-}
-
-package() {
-  depends=(${depends[@]} "torcs-data=$pkgver")
-  cd $srcdir/$pkgname-${pkgver/_/-}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png
-  install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop
-  find ${pkgdir} -type d -exec chmod 755 {} \;
-}
diff --git a/community-staging/torcs/torcs-gcc.patch b/community-staging/torcs/torcs-gcc.patch
deleted file mode 100644
index fcc5604e7..000000000
--- a/community-staging/torcs/torcs-gcc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
---- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
-@@ -10,8 +10,10 @@
-  ***************************************************************************/
- #include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- #include <cmath>
- #include <cassert>
-+#include <ctime>
- #include <list>
- #include <vector>
- #include "Trajectory.h"
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- 
- #include <algorithm>
--#include <new.h>
-+#include <new>
- 
- class BBoxCompAxis {
- public:
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- #include "BBoxTree.h"
- 
--#include <new.h>
-+#include <new>
- 
- BBoxInternal *free_node;
- 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Object.h"
- #include "Encounter.h"
- 
--#include <new.h>
-+#include <new>
- 
- void addPair(ObjectPtr object1, ObjectPtr object2);
- void removePair(ObjectPtr object1, ObjectPtr object2);
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
-@@ -33,7 +33,7 @@
- #include "Convex.h" 
- #include "Complex.h" 
- 
--#include <new.h>
-+#include <new>
- 
- Object::Object(DtObjectRef obj, ShapePtr shape) : 
-   ref(obj), 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
-@@ -37,7 +37,7 @@
- }
- 
- #include <vector>
--#include <new.h>  
-+#include <new>  
- 
- typedef vector<unsigned int> IndexBuf;
- 
diff --git a/community-staging/torcs/torcs.desktop b/community-staging/torcs/torcs.desktop
deleted file mode 100644
index 03d1ba010..000000000
--- a/community-staging/torcs/torcs.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=TORCS
-Comment=The Open Racing Car Simulator
-Exec=torcs
-Icon=torcs.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community-staging/torcs/torcs.sh b/community-staging/torcs/torcs.sh
deleted file mode 100644
index 0f1b4fe8d..000000000
--- a/community-staging/torcs/torcs.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-export PATH=$PATH:/opt/torcs/bin
diff --git a/community-staging/tuxpaint/PKGBUILD b/community-staging/tuxpaint/PKGBUILD
deleted file mode 100644
index f3d2542d1..000000000
--- a/community-staging/tuxpaint/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 62975 2012-01-29 20:05:10Z ebelanger $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
-# Adopted: royrocks <royrocks13@gmail.com>
-pkgname=tuxpaint
-pkgver=0.9.21
-pkgrel=5
-pkgdesc="Tux Paint is a free drawing program designed for young children."
-arch=('i686' 'x86_64')
-url="http://www.tuxpaint.org"
-license=('GPL')
-backup=('etc/tuxpaint/tuxpaint.conf')
-depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg')
-source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch)
-md5sums=('a88401d1860648098eeed819cff038fa'
-         '11d11119b3316c13f7b7a77048317bce')
-sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4'
-          '5595a65ebabc46bebd2d0670589effc8dbdd4e0c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # python2 fix
- for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
- sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile
- echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop
- make PREFIX=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install
- chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/*
- chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html"
-}
diff --git a/community-staging/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch b/community-staging/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
deleted file mode 100644
index 25e80cd2a..000000000
--- a/community-staging/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
-No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
-
---- src/tuxpaint.c	2011/07/29 21:27:39	1.828
-+++ src/tuxpaint.c	2011/08/08 17:59:12	1.829
-@@ -13425,12 +13425,7 @@
-       {
- 	png_init_io(png_ptr, fi);
- 
--	info_ptr->width = surf->w;
--	info_ptr->height = surf->h;
--	info_ptr->bit_depth = 8;
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->interlace_type = 1;
--	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
-+        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
- 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
- 				   PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/community-staging/tvtime/PKGBUILD b/community-staging/tvtime/PKGBUILD
deleted file mode 100644
index b182e7efd..000000000
--- a/community-staging/tvtime/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 62500 2012-01-20 09:35:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:thefatprecious <marty@loomar.com>
-
-pkgname=tvtime
-pkgver=1.0.2
-pkgrel=3
-pkgdesc="A high quality television application for use with video capture cards"
-arch=('i686' 'x86_64')
-url='http://tvtime.sourceforge.net/'
-license=('GPL' 'LGPL')
-depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv'
-	 'libsm' 'libxxf86vm')
-makedepends=('libxt' 'v4l-utils')
-source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz
-	tvtime-1.0.2+linux-headers-2.6.18.patch
-	tvtime-1.0.2-gcc41.patch
-	tvtime-1.0.2-locale_t.patch)
-md5sums=('4b3d03afe61be239b08b5e522cd8afed'
-         'e956821745686b5b3a784f7471996ade'
-         'c782789825dfa664e1f6fcc96ac7246c'
-         '1069dc5b47bba8456cbf48e34cb5c0b6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch
-  patch -p1 < ../tvtime-1.0.2-gcc41.patch
-  patch -p1 < ../tvtime-1.0.2-locale_t.patch
-  sed -i '1,1i#include <zlib.h>' src/pngoutput.c
-  [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc
-  make
-  make DESTDIR=$pkgdir install
-  install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml
-}
diff --git a/community-staging/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/community-staging/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
deleted file mode 100644
index d0772783d..000000000
--- a/community-staging/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: tvtime-1.0.2/src/videoinput.c
-===================================================================
---- tvtime-1.0.2.orig/src/videoinput.c
-+++ tvtime-1.0.2/src/videoinput.c
-@@ -35,8 +35,9 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
--#include "videodev.h"
--#include "videodev2.h"
-+#include <libv4l1-videodev.h>
-+#include <linux/videodev2.h>
-+#define BASE_VIDIOCPRIVATE      192             /* 192-255 are private */
- #include "videoinput.h"
- #include "mixer.h"
- 
diff --git a/community-staging/tvtime/tvtime-1.0.2-gcc41.patch b/community-staging/tvtime/tvtime-1.0.2-gcc41.patch
deleted file mode 100644
index 58e9bb204..000000000
--- a/community-staging/tvtime/tvtime-1.0.2-gcc41.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
---- tvtime-1.0.1/plugins/greedyh.asm	2005-08-14 18:16:43.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm	2005-11-28 17:53:09.210774544 +0100
-@@ -18,7 +18,7 @@
- 
- #include "x86-64_macros.inc"
- 
--void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
-+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
- {
-     int64_t i;
-     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
---- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc	2004-10-20 17:31:05.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc	2005-11-28 17:53:33.251119856 +0100
-@@ -5,9 +5,9 @@
- #endif
- 
- #ifdef USE_STRANGE_BOB
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
- #else
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
- #endif
- 
- int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
---- tvtime-1.0.1/plugins/tomsmocomp.cpp	2004-10-20 19:38:04.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp	2005-11-28 17:52:53.862107896 +0100
-@@ -31,7 +31,7 @@
- 
- #define IS_MMX
- #define SSE_TYPE MMX
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
-+#define FUNCT_NAME filterDScaler_MMX
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_MMX
- #undef  SSE_TYPE
-@@ -39,7 +39,7 @@
- 
- #define IS_3DNOW
- #define SSE_TYPE 3DNOW
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
-+#define FUNCT_NAME filterDScaler_3DNOW
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_3DNOW
- #undef  SSE_TYPE
-@@ -47,7 +47,7 @@
- 
- #define IS_SSE
- #define SSE_TYPE SSE
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
-+#define FUNCT_NAME filterDScaler_SSE
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_SSE
- #undef  SSE_TYPE
diff --git a/community-staging/tvtime/tvtime-1.0.2-locale_t.patch b/community-staging/tvtime/tvtime-1.0.2-locale_t.patch
deleted file mode 100644
index cbbb05458..000000000
--- a/community-staging/tvtime/tvtime-1.0.2-locale_t.patch
+++ /dev/null
diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD
deleted file mode 100644
index dd662a775..000000000
--- a/community-staging/vdrift/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 61757 2012-01-07 12:47:59Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2011.10.22
-pkgrel=2
-pkgdesc="An open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('6f8806ab1be303e9e1e47522c9eee890')
-install=vdrift.install
-
-build() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
-  #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp
-  #sed -i '/types.h/d' src/http.h
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-
-  # install icons
-  install -Dm644 data/textures/icons/vdrift-16x16.png \
-    "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-32x32.png \
-    "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png \
-    "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
-
-  rm -r $pkgdir/usr/share/vdrift
-}
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop
deleted file mode 100644
index 7078f0d9c..000000000
--- a/community-staging/vdrift/vdrift.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=VDrift
-Version=2009-06-15
-GenericName=Racing Simulation
-Comment=An open source driving simulation made with drift racing in mind
-Exec=vdrift
-Icon=vdrift.png
-Terminal=false
-Categories=Game;Simulation;
diff --git a/community-staging/vdrift/vdrift.install b/community-staging/vdrift/vdrift.install
deleted file mode 100644
index 868f6717b..000000000
--- a/community-staging/vdrift/vdrift.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/virtviewer/PKGBUILD b/community-staging/virtviewer/PKGBUILD
deleted file mode 100644
index 139775774..000000000
--- a/community-staging/virtviewer/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 62502 2012-01-20 09:36:11Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jonathan Wiersma <archaur at jonw dot org>
-
-pkgname=virtviewer
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
-depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
-makedepends=('intltool')
-url="http://virt-manager.et.redhat.com"
-arch=('i686' 'x86_64')
-license=('GPL')
-source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('1cc86ed3fbbe37a56faa6476b2e6dbcd')
-
-build() {
-  cd $srcdir/virt-viewer-$pkgver
-  export LDFLAGS=-lX11
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/vtk/PKGBUILD b/community-staging/vtk/PKGBUILD
deleted file mode 100644
index 0c43a5da1..000000000
--- a/community-staging/vtk/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 62280 2012-01-18 23:04:23Z tdziedzic $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=8
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
-            'java-runtime: java bindings'
-            'tk: tcl bindings'
-            'gnuplot: plotting tools'
-            'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff'
-        'ffmpeg-0.8.diff'
-        'fix-boost-graph-api-changes.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
-         'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389'
-         'e992321c9d1def6034d0fa6607b40c5a'
-         'e715aef2aea26fc05f904efb5d0d5627')
-
-build() {
-  cd VTK
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
-  # fix compilation error:
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12772
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  # flags to enable using system libs
-  local cmake_system_flags=""
-  for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do # LIBPROJ4
-    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
-
-  # flags to use python2 instead of python which is 3.x.x on archlinux
-  local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
-
-  cmake \
-    -Wno-dev \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
-    -DBUILD_DOCUMENTATION:BOOL=ON \
-    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
-    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=ON \
-    -DVTK_USE_HYBRID:BOOL=ON \
-    -DVTK_USE_PARALLEL:BOOL=ON \
-    -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DVTK_USE_INFOVIS:BOOL=ON \
-    -DVTK_USE_GL2PS:BOOL=ON \
-    -DVTK_USE_MYSQL:BOOL=ON \
-    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
-    -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
-    -DVTK_WRAP_JAVA:BOOL=ON \
-    -DVTK_WRAP_PYTHON:BOOL=ON \
-    -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
-    -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
-    -DVTK_USE_GUISUPPORT:BOOL=ON \
-    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    ${cmake_system_flags} \
-    ${cmake_system_python_flags} \
-    ${srcdir}/VTK
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Move the vtk.jar to the arch-specific location
-  install -dv ${pkgdir}/usr/share/java/vtk
-  mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
-    ${pkgdir}/usr/share/java/vtk
-
-  # Install license
-  install -dv ${pkgdir}/usr/share/licenses/vtk
-  install -m644 ${srcdir}/VTK/Copyright.txt \
-    ${pkgdir}/usr/share/licenses/vtk
-
-  # Put an entry in /etc/ld.so.conf.d
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
diff --git a/community-staging/vtk/ffmpeg-0.8.diff b/community-staging/vtk/ffmpeg-0.8.diff
deleted file mode 100644
index 523919d6f..000000000
--- a/community-staging/vtk/ffmpeg-0.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
-   [ Michael Schutte ]
-   * Non-maintainer upload.
-   * Remove absolute paths to required libraries from
-     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
-     #506992.  Due to the multiarch transition, the original behavior
-     frequently causes reverse build-deps to FTBFS.  This change should
-     probably be reverted once all required libraries are multiarched.
- .
-   [ Steve M. Robbins ]
-   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
-   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
-     0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr@debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
-     }
- 
-   //choose avi media file format
--  this->avOutputFormat = guess_format("avi", NULL, NULL);
-+  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
-   if (!this->avOutputFormat) 
-     {
-     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
-   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
--  c->codec_type = CODEC_TYPE_VIDEO;
-+  c->codec_type = AVMEDIA_TYPE_VIDEO;
-   c->width = this->Dim[0];
-   c->height = this->Dim[1];
-   c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
-     pkt.stream_index = this->avStream->index;
-     if (cc->coded_frame->key_frame) //treat keyframes well
-       {
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       }
-     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
-     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community-staging/vtk/fix-boost-graph-api-changes.diff b/community-staging/vtk/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 2162e7a28..000000000
--- a/community-staging/vtk/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date:   Tue Dec 13 15:36:06 2011 -0500
-
-    BUG: 12772 fixes for change in Boost graph API
-    
-    This fixes bug 12772, where an API change in Boost was causing
-    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
-    reporting the issue and posting the patch.
-    
-    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
- 
- 
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+    return e.underlying_desc.Id;
-+  }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
- 
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
--    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+                                  unwrap_edge_id(e), tree_e.Id);
-   }
- 
- private:
diff --git a/community-staging/vtk/fixkernelversioncheck.diff b/community-staging/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-staging/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-staging/w3cam/PKGBUILD b/community-staging/w3cam/PKGBUILD
deleted file mode 100644
index 7b6a1b0b5..000000000
--- a/community-staging/w3cam/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 62504 2012-01-20 09:37:26Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Christian Schmidt <mucknert@gmx.net>
-
-pkgname=w3cam
-pkgver=0.7.2
-pkgrel=10
-pkgdesc="a small and fast CGI program to retrieve images from a video4linux device."
-arch=('i686' 'x86_64')
-url="http://mpx.freeshell.net/"
-license=('GPL')
-depends=('libpng' 'libjpeg')
-makedepends=('v4l-utils')
-source=(http://mpx.freeshell.net/$pkgname-$pkgver.tar.gz)
-md5sums=('eec0b301b32bc8e9f65a4e54248c9868')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's|#include <linux/videodev.h>|#include <libv4l1-videodev.h>|' v4l.c vidcat.c w3cam.c w3camd/w3v4l.c
-  ./configure --prefix=/usr --with-device=/dev/video0 --with-ttf-inc=/usr/include/freetype
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/cgi-bin $pkgdir/usr/bin $pkgdir/usr/man/man1 $pkgdir/usr/share/
-  make prefix=$pkgdir/usr/ install
-  mkdir -p $pkgdir/usr/lib/w3cam/
-  mv $pkgdir/usr/cgi-bin/* $pkgdir/usr/lib/w3cam/
-  mv $pkgdir/usr/man $pkgdir/usr/share/man
-  rm -rf $pkgdir/usr/cgi-bin
-}
diff --git a/community-staging/warmux/PKGBUILD b/community-staging/warmux/PKGBUILD
deleted file mode 100644
index 5a1ce20af..000000000
--- a/community-staging/warmux/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62923 2012-01-29 09:31:14Z lcarlier $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: pukyxd 
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-
-pkgname=warmux
-pkgver=11.04.1
-pkgrel=4
-pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
-url="http://www.wormux.org/"
-license=('GPL')
-makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
-replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	include-zlib.patch
-	gcc-fix.patch)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
-         'c8285955e880f80e3c68312715a3061c'
-         '693176b72c9568c0c223be76ea7dd0d2')
-
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  # libpng 1.5 fix
-  patch -Np1 -i ../include-zlib.patch
-  # gcc fix
-  patch -Np1 -i ../gcc-fix.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
-
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -r ${pkgdir}/usr/share/warmux
-}
diff --git a/community-staging/warmux/gcc-fix.patch b/community-staging/warmux/gcc-fix.patch
deleted file mode 100644
index d4ceb0746..000000000
--- a/community-staging/warmux/gcc-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-## i-love-you-lordheavy.patch [diff]
-diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
---- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
-@@ -81,7 +81,7 @@
- }
- 
- // Build an action from a network packet
--Action::Action(const char *buffer, DistantComputer* _creator)
-+Action::Action(char *buffer, DistantComputer* _creator)
- {
-   m_creator = _creator;
- 
-diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
---- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
-@@ -168,7 +168,7 @@
-   Action(Action_t type, Double value1, Double value2);
- 
-   // Build an action from a network packet
--  Action(const char* buffer, DistantComputer* _creator);
-+  Action(char* buffer, DistantComputer* _creator);
- 
-   ~Action();
- 
diff --git a/community-staging/warmux/include-zlib.patch b/community-staging/warmux/include-zlib.patch
deleted file mode 100644
index c7e77aba1..000000000
--- a/community-staging/warmux/include-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
---- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
-+++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
-@@ -25,6 +25,7 @@
- #include <SDL_image.h>
- #include <SDL_rotozoom.h>
- #include <png.h>
-+#include <zlib.h>
- 
- #include "graphic/surface.h"
- #include "tool/math_tools.h"
diff --git a/community-staging/warzone2100/PKGBUILD b/community-staging/warzone2100/PKGBUILD
deleted file mode 100644
index 0fe2c8341..000000000
--- a/community-staging/warzone2100/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62625 2012-01-22 20:35:31Z lcarlier $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-
-pkgname=warzone2100
-pkgver=2.3.9
-pkgrel=2
-pkgdesc="3D realtime strategy game on a future Earth"
-url="http://wz2100.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
-makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip')
-source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7185090a089c9c0e0eca7535a8f25dca')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --with-distributor="Arch linux"
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD
deleted file mode 100644
index 7e84f2d83..000000000
--- a/community-staging/widelands/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 62462 2012-01-20 07:32:03Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=16
-_realver=build16
-pkgrel=5
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-url="http://widelands.org/"
-license=('GPL')
-makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
-source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2
-        widelands-0.16-libpng15.patch
-        $pkgname.desktop
-        $pkgname.png
-        $pkgname.sh)
-md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
-         'e492620b071cbd1db04280173653a67c'
-         '15820bf099fd6f16251fe70a75c534bb'
-         '3dfda7e9ca76ca00dd98d745d0ceb328'
-         '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
-    cd $srcdir/$pkgname-$_realver-src
-
-    patch -Np0 < $srcdir/widelands-0.16-libpng15.patch
-
-    mkdir -p build/compile && cd build/compile
-
-    cmake ../.. -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_DATADIR=share/$pkgname \
-        -DWL_INSTALL_BINDIR=bin
-    make
-}
-
-package() {
-    depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16')
-
-    cd $srcdir/$pkgname-$_realver-src/build/compile
-
-    make DESTDIR="$pkgdir" install
-
-    rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds}
-
-    # Install bin, icon and desktop file
-    #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
-    #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
-    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
-    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-}
diff --git a/community-staging/widelands/widelands-0.16-libpng15.patch b/community-staging/widelands/widelands-0.16-libpng15.patch
deleted file mode 100644
index 9f733e7b9..000000000
--- a/community-staging/widelands/widelands-0.16-libpng15.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/graphic/SDL_mng.cc
-+++ src/graphic/SDL_mng.cc
-@@ -276,7 +276,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		SDL_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -356,9 +356,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--			int const s = (info_ptr->channels == 4) ? 0 : 8;
-+			int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -369,7 +369,7 @@
- 		SDL_AllocSurface
- 			(SDL_SWSURFACE,
- 			 width, height,
--			 bit_depth * info_ptr->channels,
-+			 bit_depth * png_get_channels(png_ptr, info_ptr),
- 			 Rmask, Gmask, Bmask, Amask);
- 	if (not surface) {
- 		SDL_SetError("Out of memory");
-@@ -407,6 +407,9 @@
- 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
- 	png_read_end(png_ptr, info_ptr);
- 
-+	png_colorp png_palette;
-+	int png_num_palette;
-+
- 	/* Load the palette, if any */
- 	if ((palette = surface->format->palette)) {
- 		if (color_type == PNG_COLOR_TYPE_GRAY) {
-@@ -416,12 +419,12 @@
- 				palette->colors[i].g = i;
- 				palette->colors[i].b = i;
- 			}
--		} else if (info_ptr->num_palette > 0) {
--			palette->ncolors = info_ptr->num_palette;
--			for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
--				palette->colors[i].b = info_ptr->palette[i].blue;
--				palette->colors[i].g = info_ptr->palette[i].green;
--				palette->colors[i].r = info_ptr->palette[i].red;
-+		} else if (png_num_palette > 0) {
-+			palette->ncolors = png_num_palette;
-+			for (uint32_t i = 0; i < png_num_palette; ++i) {
-+				palette->colors[i].b = png_palette[i].blue;
-+				palette->colors[i].g = png_palette[i].green;
-+				palette->colors[i].r = png_palette[i].red;
- 			}
- 		}
- 	}
diff --git a/community-staging/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch
deleted file mode 100644
index 6ba313358..000000000
--- a/community-staging/widelands/widelands-build15-gcc-4.5-patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-07-01 21:15:56.000000000 +0000
-@@ -113,7 +113,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Map::button_clicked, *this, 4,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -142,7 +142,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name
- 			 	());
- 		break;
- 	}
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-07-01 21:17:39.000000000 +0000
-@@ -272,7 +272,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -343,7 +343,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 		break;
- 	case 9:
- 		break;
-@@ -476,7 +476,7 @@
- 			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
- 			++m_currentworld;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 		button_clicked(-1);  // Update other values in UI as well
- 
diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop
deleted file mode 100644
index 9715d816c..000000000
--- a/community-staging/widelands/widelands.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-GenericName=Widelands
-Comment=Realtime strategy game
-Icon=widelands
-Exec=widelands
-Type=Application
-Categories=Game;StrategyGame;
diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png
deleted file mode 100644
index c329cf667..000000000
--- a/community-staging/widelands/widelands.png
+++ /dev/null
diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh
deleted file mode 100644
index 0b21a1694..000000000
--- a/community-staging/widelands/widelands.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/widelands
-./widelands $*
diff --git a/community-staging/xautomation/PKGBUILD b/community-staging/xautomation/PKGBUILD
deleted file mode 100644
index 9804e1f69..000000000
--- a/community-staging/xautomation/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 62796 2012-01-27 01:27:49Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com>
-
-pkgname=xautomation
-pkgver=1.05
-pkgrel=2
-pkgdesc='Controls X from the command line and does "visual scraping".'
-url='http://hoopajoo.net/projects/xautomation.html'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libpng' 'libxtst')
-source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz"
-        'xautomation-1.05-fix-libs.patch')
-md5sums=('4526ea5085a680a3ae8629af1731e5fa'
-         'a8d8b12ed180ce9693f706d0f75d97fe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../xautomation-1.05-fix-libs.patch
-
-  ./configure --prefix=/usr 
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install	
-}
diff --git a/community-staging/xautomation/xautomation-1.05-fix-libs.patch b/community-staging/xautomation/xautomation-1.05-fix-libs.patch
deleted file mode 100644
index ee3f9247a..000000000
--- a/community-staging/xautomation/xautomation-1.05-fix-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rup xautomation-1.05.orig/Makefile.am xautomation-1.05/Makefile.am
---- xautomation-1.05.orig/Makefile.am	2009-04-14 18:06:23.000000000 +0200
-+++ xautomation-1.05/Makefile.am	2012-01-27 02:06:44.016492587 +0100
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = xte rgb2pat png2pat visgrep pat2ppm patextract xmousepos
- man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
- xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
--xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
-+xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11
- rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
- rgb2pat_LDADD = -lpng
- png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h
-diff -rup xautomation-1.05.orig/Makefile.in xautomation-1.05/Makefile.in
---- xautomation-1.05.orig/Makefile.in	2011-09-07 00:48:19.000000000 +0200
-+++ xautomation-1.05/Makefile.in	2012-01-27 02:14:02.010831581 +0100
-@@ -220,7 +220,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
- xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
--xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
-+xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11
- rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
- rgb2pat_LDADD = -lpng
- png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h
diff --git a/community-staging/xemacs/PKGBUILD b/community-staging/xemacs/PKGBUILD
deleted file mode 100644
index d2e6986ae..000000000
--- a/community-staging/xemacs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 62802 2012-01-27 02:53:33Z ebelanger $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor : Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=xemacs
-pkgver=21.5.31
-pkgrel=5
-pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
-arch=('i686' 'x86_64')
-url="http://www.xemacs.org/"
-license=('GPL')
-depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
-optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
-            'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
-makedepends=('xbitmaps')
-install=xemacs.install
-source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz
-        xemacs.desktop
-        xemacs-21.5.29-optimization-bug.patch)
-md5sums=('0185fe905d0b8d8d094d9b60cf262d4a'
-         'a4d3d5c0aa2c7ce7bec491f809ca3694'
-         'eb061b10ea3bbe1026df5326ae1618e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
-# (and possibly other arches). See
-# http://tracker.xemacs.org/XEmacs/its/issue354
-# for the upstream bug report.
-  patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch
- 	
-  ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
-      --without-postgresql --with-athena=xaw \
-      --enable-database=berkdb --without-ldap \
-      --enable-menubars=lucid --enable-scrollbars=lucid \
-      --enable-widgets=athena --enable-dialogs=athena \
-      --enable-external-widget \
-      --with-jpeg --with-png --with-tiff \
-      --with-ncurses --with-pop --with-xfs --disable-sound \
-      --infodir=/usr/share/info \
-      --with-mule \
-      --mandir=/usr/share/man/man1
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el
-
-  rm "${pkgdir}"/usr/bin/{b2m,ctags,etags}
-  rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1}
-
-  # fix  FS#7927
-  install -d -m755 "${pkgdir}/usr/share/pixmaps"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm"
-
-  # correct permissions
-  chown -R root:root "${pkgdir}"
-
-  rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch
deleted file mode 100644
index 32a1a02c2..000000000
--- a/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Work around a GCC optimization bug as described in
-http://tracker.xemacs.org/XEmacs/its/issue354
-
---- src/dumper.c.~1~	2008-01-26 09:54:11.000000000 +0100
-+++ src/dumper.c	2008-05-03 10:17:03.000000000 +0200
-@@ -2584,7 +2584,7 @@
- #endif /* !WIN32_NATIVE */
- 
- 
--static int
-+int
- pdump_file_try (Wexttext *exe_path)
- {
-   Wexttext *w = exe_path + wext_strlen (exe_path);
diff --git a/community-staging/xemacs/xemacs.desktop b/community-staging/xemacs/xemacs.desktop
deleted file mode 100644
index 257c56947..000000000
--- a/community-staging/xemacs/xemacs.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Name=XEmacs Text Editor
-Name[bg]=редактор XEmacs
-Name[ca]=Editor XEmacs
-Name[cs]=Editor XEmacs
-Name[da]=XEmacs tekstredigerer
-Name[de]=XEmacs Texteditor
-Name[eo]=La redaktilo XEmakso
-Name[es]=Emacs para X
-Name[et]=Emacs X'i kasutajaliidesega
-Name[fi]=XEmacs editori
-Name[fr]=Éditeur XEmacs
-Name[hu]=XEmacs szövegszerkesztő
-Name[is]=XEmacs-ritill
-Name[it]=Emacs per X
-Name[ja]=XEmacs テキスト・エディター
-Name[mk]=Софистицираниот XEmacs уредувач
-Name[no]=XEmacs-tekstredigerer
-Name[pt]=Editor XEmacs
-Name[ro]=Editorul XEmacs
-Name[ru]=Редактор XEmacs
-Name[sk]=Editor XEmacs
-Name[sl]=Urejevalnik XEmacs
-Name[uk]=Редактор XEmacs
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=xemacs %f
-Icon=/usr/share/pixmaps/xemacs-icon.xpm
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-Encoding=UTF-8
-StartupWMClass=Emacs
diff --git a/community-staging/xemacs/xemacs.install b/community-staging/xemacs/xemacs.install
deleted file mode 100644
index a04ee187f..000000000
--- a/community-staging/xemacs/xemacs.install
+++ /dev/null
@@ -1,35 +0,0 @@
-infodir=usr/share/info
-filelist=(beta.info.gz custom.info.gz 
-	  emodules.info.gz external-widget.info.gz 
-	  internals.info-1.gz internals.info-2.gz 
-	  internals.info-3.gz internals.info-4.gz 
-	  internals.info-5.gz internals.info.gz 
-	  lispref.info-1.gz lispref.info-10.gz 
-	  lispref.info-2.gz lispref.info-3.gz 
-	  lispref.info-4.gz lispref.info-5.gz 
-	  lispref.info-6.gz lispref.info-7.gz 
-	  lispref.info-8.gz lispref.info-9.gz 
-	  lispref.info.gz new-users-guide.info.gz 
-	  term.info.gz termcap.info.gz 
-	  xemacs-faq.info-1.gz xemacs-faq.info-2.gz 
-	  xemacs-faq.info.gz xemacs.info-1.gz 
-	  xemacs.info-2.gz xemacs.info-3.gz 
-	  xemacs.info-4.gz xemacs.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-  update-desktop-database -q
-}
diff --git a/community-staging/xloadimage/PKGBUILD b/community-staging/xloadimage/PKGBUILD
deleted file mode 100644
index 6d56ec5c4..000000000
--- a/community-staging/xloadimage/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 62316 2012-01-19 08:03:43Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=xloadimage
-pkgver=4.1
-pkgrel=12
-pkgdesc="An utility to view many different types of images under X11"
-arch=(i686 x86_64)
-#url="http://world.std.com/~jimf/xloadimage.html"
-url="http://sioseis.ucsd.edu/xloadimage.html"
-license=("MIT")
-depends=('libtiff' 'libpng' 'libx11' 'libxext')
-makedepends=('patch' 'imake')
-source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz
-	license.txt
-	enable-image-types.patch
-	png15-tiff4.patch)
-md5sums=('86b42b1b628a9c00008b7deec21e1175'
-         'cc16a51aeb5083b8ff07939dfe244130'
-         '3a2703925011276fd2d2bd139b676487'
-         'c797cfc3f4588b96275d82c2c9cc7025')
-
-build() {
-  cd $srcdir/$pkgname.$pkgver
-
-  patch -p1 <$srcdir/enable-image-types.patch
-  patch -p1 <$srcdir/png15-tiff4.patch
-  xmkmf
-  make
-
-  install -D -m755 xloadimage $pkgdir/usr/bin/xloadimage
-  install -D -m755 uufilter $pkgdir/usr/bin/uufilter
-  install -D -m644 xloadimagerc $pkgdir/etc/xloadimagerc.example
-  install -D -m644 xloadimage.man $pkgdir/usr/man/man1/xloadimage.1x
-  install -D -m644 uufilter.man $pkgdir/usr/man/man1/uufilter.1x
-  install -D -m644 $srcdir/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
-  ln -s /usr/bin/xloadimage $pkgdir/usr/bin/xsetbg
-
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
diff --git a/community-staging/xloadimage/enable-image-types.patch b/community-staging/xloadimage/enable-image-types.patch
deleted file mode 100644
index b61e36b87..000000000
--- a/community-staging/xloadimage/enable-image-types.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -wbBur xloadimage.4.1/imagetypes.h xloadimage.4.1.my/imagetypes.h
---- xloadimage.4.1/imagetypes.h	2011-02-11 11:47:37.000000000 +0000
-+++ xloadimage.4.1.my/imagetypes.h	2011-02-11 16:04:35.000000000 +0000
-@@ -94,15 +94,9 @@
-   {niffIdent,      niffLoad,      niffDump,    "niff",      "Native Image File Format (NIFF)"},
-   {sunRasterIdent, sunRasterLoad, NULL,        "sunraster", "Sun Rasterfile"},
-   {gifIdent,       gifLoad,       NULL,        "gif",       "GIF Image"},
--#ifdef HAVE_LIBJPEG
-   {jpegIdent,      jpegLoad,      jpegDump,    "jpeg",      "JFIF-style JPEG Image"},
--#endif
--#ifdef HAVE_LIBTIFF
-   {tiffIdent,      tiffLoad,      tiffDump,    "tiff",      "TIFF image"},
--#endif
--#ifdef HAVE_LIBPNG
-   {pngIdent,       pngLoad,       NULL,        "png",       "PNG image"},
--#endif
-   {fbmIdent,       fbmLoad,       NULL,        "fbm",       "FBM Image"},
-   {cmuwmIdent,     cmuwmLoad,     NULL,        "cmuraster", "CMU WM Raster"},
-   {pbmIdent,       pbmLoad,       pbmDump,     "pbm",       "Portable Bit Map (PBM, PGM, PPM)"},
-diff -wbBur xloadimage.4.1/Imakefile xloadimage.4.1.my/Imakefile
---- xloadimage.4.1/Imakefile	2011-02-11 12:05:53.000000000 +0000
-+++ xloadimage.4.1.my/Imakefile	2011-02-11 16:06:21.000000000 +0000
-@@ -40,7 +40,7 @@
-  PNG_SRC = png.c
-  PNG_OBJ = png.o
- 
--  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS)
-+  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG
- LOCAL_LIBRARIES = $(TIFF_LIB)  $(JPEG_LIB) $(PNG_LIB) $(XLIB)
- 
- SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c  mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c  rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c  xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c  merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c  xloadimage.c  $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC)
-diff -wbBur xloadimage.4.1/Makefile xloadimage.4.1.my/Makefile
---- xloadimage.4.1/Makefile	2011-02-11 12:06:16.000000000 +0000
-+++ xloadimage.4.1.my/Makefile	2011-02-11 16:06:24.000000000 +0000
-@@ -2,7 +2,7 @@
- # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
- 
- # ----------------------------------------------------------------------
--# Makefile generated from "Imake.tmpl" and </tmp/IIf.yUZBVe>
-+# Makefile generated from "Imake.tmpl" and </tmp/IIf.7u155R>
- # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
- # $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $
- #
-@@ -1063,7 +1063,7 @@
-  PNG_SRC = png.c
-  PNG_OBJ = png.o
- 
--  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS)
-+  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG
- LOCAL_LIBRARIES = $(TIFF_LIB)  $(JPEG_LIB) $(PNG_LIB) $(XLIB)
- 
- SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c  mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c  rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c  xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c  merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c  xloadimage.c  $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC)
-diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c
---- xloadimage.4.1/png.c	2011-02-11 11:47:37.000000000 +0000
-+++ xloadimage.4.1.my/png.c	2011-02-11 16:06:50.000000000 +0000
-@@ -18,6 +18,7 @@
-  * 
-  */
- 
-+#define _GETOPT_H
- 
- #include "image.h"	/* xloadimage declarations */
- #ifdef HAVE_LIBPNG
-diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c
---- xloadimage.4.1/jpeg.c	2011-02-11 14:47:37.000000000 +0300
-+++ xloadimage.4.1.my/jpeg.c	2011-11-21 14:32:30.000000000 +0400
-@@ -319,6 +319,7 @@
-       if (verbose)
- 	printf("  Using arithmetic coding.\n");
-       cinfo->arith_code = TRUE;
-+    }
- #else
-       fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n");
-     }
diff --git a/community-staging/xloadimage/license.txt b/community-staging/xloadimage/license.txt
deleted file mode 100644
index be7eec597..000000000
--- a/community-staging/xloadimage/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 1989, 1993 Jim Frost
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  The author makes no representations
- * about the suitability of this software for any purpose.  It is
- * provided "as is" without express or implied warranty.
- *
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
- */
diff --git a/community-staging/xloadimage/png15-tiff4.patch b/community-staging/xloadimage/png15-tiff4.patch
deleted file mode 100644
index 8536e36f3..000000000
--- a/community-staging/xloadimage/png15-tiff4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c
---- xloadimage.4.1/png.c	2011-02-11 14:47:37.000000000 +0300
-+++ xloadimage.4.1.my/png.c	2012-01-19 11:58:44.000000000 +0400
-@@ -75,7 +75,7 @@
- {
-   debug(" #error ");
-   output_warn( png_ptr, str);
--  longjmp(png_ptr->jmpbuf, 1);	/* return control to outer routine */
-+  longjmp(png_jmpbuf(png_ptr), 1);	/* return control to outer routine */
- }
- 
- 
-@@ -164,7 +164,7 @@
-     png_destroy_read_struct(png_pp, info_pp, end_pp);
-     return 0;
-   }
--  if (setjmp((*png_pp)->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(*png_pp))) {
-     /* On error */
-     png_destroy_read_struct(png_pp, info_pp, end_pp);
-     return 0;
-@@ -220,7 +220,7 @@
-     zclose(zinput_file);
-     return 0;
-   }
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* On error */
-     freeImage(image);
-     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-diff -wbBur xloadimage.4.1/tiff.c xloadimage.4.1.my/tiff.c
---- xloadimage.4.1/tiff.c	2011-02-11 14:47:38.000000000 +0300
-+++ xloadimage.4.1.my/tiff.c	2012-01-19 12:00:00.000000000 +0400
-@@ -34,14 +34,14 @@
-      struct tiff_info *info;
- {
-   ZFILE *zf;
--  TIFFHeader th;
-+  TIFFHeaderCommon th;
-   TIFF *tiff;
- 
-   zf = zopen(fullname);
- 
-   /* read TIFF header and see if it looks right
-    */
--  if ((zread(zf, (byte *)&th, sizeof(TIFFHeader)) == sizeof(TIFFHeader)) &&
-+  if ((zread(zf, (byte *)&th, sizeof(TIFFHeaderCommon)) == sizeof(TIFFHeaderCommon)) &&
-       ((th.tiff_magic == TIFF_BIGENDIAN) ||
-        (th.tiff_magic == TIFF_LITTLEENDIAN))) {
- 
diff --git a/community-staging/xmoto/PKGBUILD b/community-staging/xmoto/PKGBUILD
deleted file mode 100644
index 0a865690d..000000000
--- a/community-staging/xmoto/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: Denis (dtonator@gmail.com)
-
-pkgname=xmoto
-pkgver=0.5.9
-pkgrel=1
-pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
-arch=('i686' 'x86_64')
-url="http://xmoto.tuxfamily.org"
-license=('GPL')
-depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
-	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++')
-install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-        'xmoto-0.5.9-libpng15.patch')
-sha1sums=('07757accce78151dc8873bef8270df0e56196772'
-          '27f52bd30772f67898e0bfd8c1e12478a4848192')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}/xmoto-0.5.9-libpng15.patch"
-
-  # build and install 
-  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install
-
-  # install desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \
-        ${pkgdir}/usr/share/applications/xmoto.desktop
-
-  # install icon for desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \
-        ${pkgdir}/usr/share/pixmaps/xmoto.xpm
-}
diff --git a/community-staging/xmoto/xmoto-0.5.9-libpng15.patch b/community-staging/xmoto/xmoto-0.5.9-libpng15.patch
deleted file mode 100644
index 0410c81c5..000000000
--- a/community-staging/xmoto/xmoto-0.5.9-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/image/tim_png.cpp	2011-10-11 22:18:11.000000000 +0200
-+++ b/src/image/tim_png.cpp	2012-01-19 19:58:24.000000000 +0100
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include "png.h"
- 
diff --git a/community-staging/xmoto/xmoto.desktop b/community-staging/xmoto/xmoto.desktop
deleted file mode 100644
index 5ae6fe226..000000000
--- a/community-staging/xmoto/xmoto.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=/usr/share/xmoto/xmoto_icone_x.ico
-Exec=/usr/bin/xmoto
-Terminal=false
-StartupNotify=false
-
-Name=XMoto
-GenericName=Game
-Comment=is a 2D physics-based motocross game.
-
-Categories=Game;
diff --git a/community-staging/xmoto/xmoto.install b/community-staging/xmoto/xmoto.install
deleted file mode 100644
index 52399d4c1..000000000
--- a/community-staging/xmoto/xmoto.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  /usr/bin/update-desktop-database 
-}
-
-post_upgrade() {
-  /usr/bin/update-desktop-database 
-}
-
-post_remove() {
-  /usr/bin/update-desktop-database 
-}
-
-op=$1
-shift
-$op $*
diff --git a/community-staging/xnc/PKGBUILD b/community-staging/xnc/PKGBUILD
deleted file mode 100644
index e28c00401..000000000
--- a/community-staging/xnc/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 62341 2012-01-19 09:59:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=xnc
-pkgver=5.0.4
-pkgrel=6
-pkgdesc="X nortern captain file manager"
-arch=(i686 x86_64)
-url="http://xnc.jinr.ru/"
-license=('GPL')
-depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7')
-makedepends=('libxt')
-options=('!makeflags')
-#source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
-source=(ftp://ftp.archlinux.org/other/community/xnc/xnc-$pkgver.src.tar.gz
-	xnc-gcc44.patch
-	libpng15.patch)
-md5sums=('62446cdfdf5730f125fb351a658c0bd3'
-         'c0037a081824bca691e59a4ec68b6686'
-         '7159af1c645fda860f0e5057100651ad')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/xnc-gcc44.patch
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/xnc/libpng15.patch b/community-staging/xnc/libpng15.patch
deleted file mode 100644
index 53b941b81..000000000
--- a/community-staging/xnc/libpng15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -wbBur xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c
---- xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c	2002-08-05 14:43:09.000000000 +0400
-+++ xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c	2012-01-19 13:46:48.000000000 +0400
-@@ -138,7 +138,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		IMG_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -207,9 +207,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -217,7 +217,7 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		IMG_SetError("Out of memory");
- 		goto done;
-@@ -252,6 +252,10 @@
- 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
- 	png_read_end(png_ptr, info_ptr);
- 
-+	png_colorp plte;
-+	int num_palette;
-+	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
- 	/* Load the palette, if any */
- 	palette = surface->format->palette;
- 	if ( palette ) {
-@@ -262,12 +266,12 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else if (num_palette > 0 ) {
-+		palette->ncolors = num_palette;
-+		for( i=0; i<num_palette; ++i ) {
-+		    palette->colors[i].b = plte[i].blue;
-+		    palette->colors[i].g = plte[i].green;
-+		    palette->colors[i].r = plte[i].red;
- 		}
- 	    }
- 	}
diff --git a/community-staging/xnc/xnc-gcc44.patch b/community-staging/xnc/xnc-gcc44.patch
deleted file mode 100644
index 120d9d467..000000000
--- a/community-staging/xnc/xnc-gcc44.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h
---- xnc-5.0.4/src/include/commonfuncs.h	2002-10-16 10:44:17.000000000 +0400
-+++ xnc-5.0.4.my/src/include/commonfuncs.h	2011-11-17 18:59:19.000000000 +0400
-@@ -15,7 +15,7 @@
- extern int   path_to_fullpath(char* dest, char *srcdir);
- extern void  add_path_content(char *curdir, const char *cont, int vms_host=0);
- extern void  upper_path(char *curdir, int vms_host=0);
--extern char* get_first_content(const char *curdir, char *cont);
-+extern const char* get_first_content(const char *curdir, char *cont);
- extern void  get_last_content(char *curdir, char *cont);
- extern void  get_last_and_rest_content(char* curdir, char* last, char* rest);
- extern void  str_swap(char *str1, char *str2);
-diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx
---- xnc-5.0.4/src/lib/tool/commonfuncs.cxx	2002-10-16 10:44:20.000000000 +0400
-+++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx	2011-11-17 18:59:19.000000000 +0400
-@@ -117,9 +117,9 @@
- }
- 
- //Get first content of dirname
--char*   get_first_content(const char *curdir, char *cont)
-+const char*   get_first_content(const char *curdir, char *cont)
- {
--        char *b=strchr(curdir,'/');
-+        const char *b=strchr(curdir,'/');
-         if(b)
-           {
-                   strncpy(cont,curdir,b-curdir);
-diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx
---- xnc-5.0.4/src/lib/vfs/afs.cxx	2003-11-27 18:36:43.000000000 +0300
-+++ xnc-5.0.4.my/src/lib/vfs/afs.cxx	2011-11-17 18:59:19.000000000 +0400
-@@ -29,7 +29,7 @@
- // The return value is static, so copy it before using the
- // method again!
- 
--char *create_dirs(char *rootdir, char* dirlist)
-+char *create_dirs(char *rootdir, const char* dirlist)
- {
-    char str[L_MAXPATH];
-    char cont[FLIST_NAME];
-@@ -1350,7 +1350,7 @@
-     add_path_content(curdir, to_dir);
-   } else        //If we here then we doing cd not to subdir but to subdir/subdir...
-   {
--    char *s=to_dir;
-+    const char *s=to_dir;
-     if(*s)
-     {
-       do
-diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx
---- xnc-5.0.4/src/lib/vfs/ftpfs.cxx	2002-10-30 15:47:38.000000000 +0300
-+++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx	2011-11-17 18:59:19.000000000 +0400
-@@ -1413,7 +1413,7 @@
-                  return;
-          if(strcmp(dir,"/"))
-          {
--                 char *s=dir;
-+                 const char *s=dir;
-                  if(*s=='/')         //Skip leading '/'
-                          s++;
-                  do
-diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx
---- xnc-5.0.4/src/man_page.cxx	2002-10-02 16:54:33.000000000 +0400
-+++ xnc-5.0.4.my/src/man_page.cxx	2011-11-17 18:59:00.000000000 +0400
-@@ -81,7 +81,7 @@
-       buf[j] = 0;
-       manf->size = j;
-       delete buf;
--      fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC);
-+      fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-       write(fp, buf2, j);
-       close(fp);
-       delete manf;
diff --git a/community-staging/xplanet/PKGBUILD b/community-staging/xplanet/PKGBUILD
deleted file mode 100644
index a0abe1efa..000000000
--- a/community-staging/xplanet/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 62310 2012-01-19 07:48:40Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=xplanet
-pkgver=1.2.2
-pkgrel=2
-pkgdesc="An Xearth wannabe"
-arch=(i686 x86_64)
-url="http://xplanet.sourceforge.net/"
-license=('GPL')
-depends=('pango' 'libungif' 'libtiff' 'libxss')
-source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz)
-md5sums=('b38c3b4cfdd772643f876a9bb15f288b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-freetype
-  make
-  make prefix=$pkgdir/usr install
-}
diff --git a/community-testing/balsa/PKGBUILD b/community-testing/balsa/PKGBUILD
deleted file mode 100644
index 43eae5357..000000000
--- a/community-testing/balsa/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 62015 2012-01-14 12:24:56Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=balsa
-pkgver=2.4.11
-pkgrel=1
-pkgdesc="An e-mail client for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://pawsa.fedorapeople.org/balsa/'
-depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils')
-makedepends=('perlxml' 'gnome-doc-utils' 'intltool')
-install=balsa.install
-source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        gmime26.patch)
-md5sums=('915c622b6385aa4f83d5eee8f31ee8e8'
-         '108d33f533558a371189441edce7d7e6')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/gmime26.patch"
-    autoreconf -fi
-
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-ssl \
-        --with-gpgme=gpgme-config \
-        --with-gss \
-        --with-ldap \
-        --with-gtksourceview \
-        --with-gtkspell \
-        --with-rubrica \
-        --with-sqlite \
-        --without-nm \
-        --without-gnome \
-        --with-html-widget=webkit
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/balsa/balsa.install b/community-testing/balsa/balsa.install
deleted file mode 100644
index 1f167b5e9..000000000
--- a/community-testing/balsa/balsa.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 $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/community-testing/balsa/gmime26.patch b/community-testing/balsa/gmime26.patch
deleted file mode 100644
index fe4e6a9fa..000000000
--- a/community-testing/balsa/gmime26.patch
+++ /dev/null
@@ -1,1372 +0,0 @@
-From 393d0077495cb750ee47bab6ec44a60906a95179 Mon Sep 17 00:00:00 2001
-From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
-Date: Mon, 28 Nov 2011 03:00:55 +0000
-Subject: Build with GMime 2.6.0
-
-	* configure.in: check for GMime >= 2.5.7
-	* libbalsa/gmime-application-pkcs7.c
-	(g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify),
-	(g_mime_application_pkcs7_encrypt),
-	(g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7.
-	* libbalsa/gmime-application-pkcs7.h: ditto.
-	* libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type),
-	(g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize),
-	(g_mime_gpgme_digest_id): ditto.
-	* libbalsa/gmime-gpgme-context.h: ditto.
-	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt),
-	(g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt):
-	ditto.
-	* libbalsa/gmime-part-rfc2440.h: ditto.
-	* libbalsa/rfc3156.c (password_request_func),
-	(libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object),
-	(libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto.
----
-diff --git a/ChangeLog b/ChangeLog
-index bd95e68..d5c62f5 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,25 @@
-+2011-11-27  Peter Bloomfield
-+
-+	Build with GMime 2.6.0
-+
-+	* configure.in: check for GMime >= 2.5.7
-+	* libbalsa/gmime-application-pkcs7.c
-+	(g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify),
-+	(g_mime_application_pkcs7_encrypt),
-+	(g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7.
-+	* libbalsa/gmime-application-pkcs7.h: ditto.
-+	* libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type),
-+	(g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize),
-+	(g_mime_gpgme_digest_id): ditto.
-+	* libbalsa/gmime-gpgme-context.h: ditto.
-+	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt),
-+	(g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt):
-+	ditto.
-+	* libbalsa/gmime-part-rfc2440.h: ditto.
-+	* libbalsa/rfc3156.c (password_request_func),
-+	(libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object),
-+	(libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto.
-+
- 2011-11-22  Pawel Salek
- 
- 	* NEWS, configure.in: release balsa-2.4.11
-diff --git a/configure.in b/configure.in
-index 4a8320e..64d99f3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -307,7 +307,12 @@ fi
- case "$with_gmime" in
-     2.4) ;;
-     2.6) AC_DEFINE([HAVE_GMIME_2_6], [1],
--                   [Defined to build with GMime version 2.5 or 2.6]) ;;
-+                   [Defined to build with GMime version 2.5 or 2.6])
-+         if $PKG_CONFIG --atleast-version=2.5.7 gmime-2.6; then
-+             AC_DEFINE([HAVE_GMIME_2_5_7], [1],
-+                       [Defined when GMime version is at least 2.5.7])
-+         fi
-+         ;;
-     *) AC_MSG_ERROR([unknown GMime version $with_gmime]) ;;
- esac
- 
-diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c
-index 12f4f8f..63b8087 100644
---- a/libbalsa/gmime-application-pkcs7.c
-+++ b/libbalsa/gmime-application-pkcs7.c
-@@ -96,8 +96,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-     GMimeFilter *crlf_filter, *from_filter;
- 	
-     g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1);
-     g_return_val_if_fail (ctx->sign_protocol != NULL, -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1);
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol(ctx)
-+                         != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail (GMIME_IS_OBJECT (content), -1);
- 	
-     /* Prepare all the parts for signing... */
-@@ -127,7 +133,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-     sig_data_stream = g_mime_stream_mem_new ();
- 	
-     /* get the signed content */
--    if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_sign
-+        (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream,
-+         sig_data_stream, err) == -1)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref (filtered_stream);
- 	g_object_unref (sig_data_stream);
- 	g_object_unref (stream);
-@@ -168,9 +181,15 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-  * decrypting it again. In this case, validity is undefined.
-  */
- GMimeObject *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_application_pkcs7_verify(GMimePart * pkcs7,
- 				GMimeSignatureValidity ** validity,
- 				GMimeCipherContext * ctx, GError ** err)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-+                                GMimeSignatureList ** list,
-+                                GMimeCryptoContext * ctx, GError ** err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeObject *decrypted;
-     GMimeDataWrapper *wrapper;
-@@ -181,8 +200,14 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-     const char *smime_type;
- 
-     g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL);
-     g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some sanity checks */
-     smime_type =
-@@ -208,9 +233,16 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-     g_object_unref(crlf_filter);
- 
-     /* get the cleartext */
-+#ifndef HAVE_GMIME_2_5_7
-     *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT,
- 				     ciphertext, filtered_stream, err);
--    if (!*validity) {
-+    if (!*validity)
-+#else /* HAVE_GMIME_2_5_7 */
-+    *list = g_mime_crypto_context_verify(ctx, GMIME_CIPHER_ALGO_DEFAULT,
-+                                         ciphertext, filtered_stream, err);
-+    if (!*list)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(filtered_stream);
- 	g_object_unref(ciphertext);
- 	g_object_unref(stream);
-@@ -248,7 +280,12 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-  */
- int
- g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-+#ifndef HAVE_GMIME_2_5_7
- 				  GMimeCipherContext *ctx, GPtrArray *recipients,
-+#else /* HAVE_GMIME_2_5_7 */
-+				  GMimeCryptoContext *ctx,
-+                                  GPtrArray *recipients,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				  GError **err)
- {
-     GMimeDataWrapper *wrapper;
-@@ -257,8 +294,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-     GMimeFilter *crlf_filter;
- 	
-     g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1);
-     g_return_val_if_fail (ctx->encrypt_protocol != NULL, -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail (GMIME_IS_OBJECT (content), -1);
- 	
-     /* get the cleartext */
-@@ -279,7 +322,15 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
- 	
-     /* encrypt the content stream */
-     ciphertext = g_mime_stream_mem_new ();
--    if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_encrypt
-+        (ctx, FALSE, NULL,
-+         GMIME_CIPHER_ALGO_DEFAULT,
-+         recipients, stream, ciphertext, err) == -1)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref (ciphertext);
- 	g_object_unref (stream);
- 	return -1;
-@@ -313,8 +364,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-  * err with more information about the reason.
-  */
- GMimeObject *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
- 				  GError **err)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_application_pkcs7_decrypt (GMimePart *pkcs7,
-+                                  GMimeCryptoContext *ctx,
-+				  GError **err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeObject *decrypted;
-     GMimeDataWrapper *wrapper;
-@@ -325,8 +382,14 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
-     const char *smime_type;
- 
-     g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL);
-     g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some sanity checks */
-     smime_type =
-@@ -353,7 +416,13 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
-     g_object_unref(crlf_filter);
- 
-     /* get the cleartext */
--    if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_decrypt
-+        (ctx, ciphertext, filtered_stream, err) == NULL)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(filtered_stream);
- 	g_object_unref(ciphertext);
- 	g_object_unref(stream);
-diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h
-index 03fa401..6678ff5 100644
---- a/libbalsa/gmime-application-pkcs7.h
-+++ b/libbalsa/gmime-application-pkcs7.h
-@@ -28,7 +28,11 @@ extern "C" {
- #endif				/* __cplusplus */
- 
- #include <gmime/gmime-part.h>
-+#ifndef HAVE_GMIME_2_5_7
- #include <gmime/gmime-cipher-context.h>
-+#else /* HAVE_GMIME_2_5_7 */
-+#include <gmime/gmime-crypto-context.h>
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #undef HAS_APPLICATION_PKCS7_MIME_SIGNED_SUPPORT
- 
-@@ -39,21 +43,40 @@ extern "C" {
-  * Balsa always encodes S/MIME signed stuff as multipart/signed. */
- int g_mime_application_pkcs7_sign(GMimePart * pkcs7,
- 				  GMimeObject * content,
-+#ifndef HAVE_GMIME_2_5_7
- 				  GMimeCipherContext * ctx,
-+#else /* HAVE_GMIME_2_5_7 */
-+				  GMimeCryptoContext * ctx,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				  const char *userid, GError ** err);
- #endif
- 
-+#ifndef HAVE_GMIME_2_5_7
- GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7,
- 					     GMimeSignatureValidity ** validity,
- 					     GMimeCipherContext * ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-+					     GMimeSignatureList ** validity,
-+					     GMimeCryptoContext * ctx, GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- int g_mime_application_pkcs7_encrypt(GMimePart * pkcs7,
- 				     GMimeObject * content,
-+#ifndef HAVE_GMIME_2_5_7
- 				     GMimeCipherContext * ctx,
-+#else /* HAVE_GMIME_2_5_7 */
-+				     GMimeCryptoContext * ctx,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				     GPtrArray * recipients, GError ** err);
- 
-+#ifndef HAVE_GMIME_2_5_7
- GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7,
- 					      GMimeCipherContext * ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7,
-+					      GMimeCryptoContext * ctx, GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #ifdef __cplusplus
- }
-diff --git a/libbalsa/gmime-gpgme-context.c b/libbalsa/gmime-gpgme-context.c
-index 24b140b..0c56f94 100644
---- a/libbalsa/gmime-gpgme-context.c
-+++ b/libbalsa/gmime-gpgme-context.c
-@@ -27,6 +27,9 @@
- #include <unistd.h>
- #include <glib.h>
- #include <gmime/gmime.h>
-+#ifdef HAVE_GMIME_2_5_7
-+#include <gmime/gmime-certificate.h>
-+#endif /* HAVE_GMIME_2_5_7 */
- #include <gpgme.h>
- #include <time.h>
- #include <glib/gi18n.h>
-@@ -44,6 +47,7 @@ static gboolean g_mime_gpgme_context_check_protocol(GMimeGpgmeContextClass
- 						    protocol,
- 						    GError ** error);
- 
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherHash g_mime_gpgme_hash_id(GMimeCipherContext * ctx,
- 					    const char *hash);
- 
-@@ -70,6 +74,46 @@ static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext *
-                                                     GMimeStream * istream,
-                                                     GMimeStream * ostream,
-                                                     GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDigestAlgo g_mime_gpgme_digest_id(GMimeCryptoContext * ctx,
-+                                              const char *hash);
-+
-+static const char *g_mime_gpgme_digest_name(GMimeCryptoContext * ctx,
-+                                            GMimeDigestAlgo hash);
-+
-+static const char
-+    *g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context);
-+static const char
-+    *g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context);
-+static const char
-+    *g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context);
-+
-+static int g_mime_gpgme_sign(GMimeCryptoContext * ctx,
-+                             const char * userid,
-+			     GMimeDigestAlgo hash,
-+                             GMimeStream * istream,
-+			     GMimeStream * ostream,
-+                             GError ** err);
-+
-+static GMimeSignatureList *g_mime_gpgme_verify(GMimeCryptoContext * ctx,
-+                                               GMimeDigestAlgo hash,
-+                                               GMimeStream * istream,
-+                                               GMimeStream * sigstream,
-+                                               GError ** err);
-+
-+static int g_mime_gpgme_encrypt(GMimeCryptoContext * ctx,
-+                                gboolean sign,
-+				const char *userid,
-+                                GMimeDigestAlgo digest,
-+                                GPtrArray * recipients,
-+				GMimeStream * istream,
-+				GMimeStream * ostream, GError ** err);
-+
-+static GMimeDecryptResult *g_mime_gpgme_decrypt(GMimeCryptoContext * ctx,
-+                                                GMimeStream * istream,
-+                                                GMimeStream * ostream,
-+                                                GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 
- /* internal passphrase callback */
-@@ -102,7 +146,11 @@ static void g_set_error_from_gpgme(GError ** error, gpgme_error_t gpgme_err,
- 				   const gchar * message);
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherContextClass *parent_class = NULL;
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeCryptoContextClass *parent_class = NULL;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 
- GType
-@@ -124,8 +172,13 @@ g_mime_gpgme_context_get_type(void)
- 	};
- 
- 	type =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_type_register_static(GMIME_TYPE_CIPHER_CONTEXT,
- 				   "GMimeGpgmeContext", &info, 0);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_type_register_static(GMIME_TYPE_CRYPTO_CONTEXT,
-+				   "GMimeGpgmeContext", &info, 0);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-     return type;
-@@ -136,19 +189,39 @@ static void
- g_mime_gpgme_context_class_init(GMimeGpgmeContextClass * klass)
- {
-     GObjectClass *object_class = G_OBJECT_CLASS(klass);
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContextClass *cipher_class =
- 	GMIME_CIPHER_CONTEXT_CLASS(klass);
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContextClass *crypto_class =
-+	GMIME_CRYPTO_CONTEXT_CLASS(klass);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     parent_class = g_type_class_ref(G_TYPE_OBJECT);
- 
-     object_class->finalize = g_mime_gpgme_context_finalize;
- 
-+#ifndef HAVE_GMIME_2_5_7
-     cipher_class->hash_id = g_mime_gpgme_hash_id;
-     cipher_class->hash_name = g_mime_gpgme_hash_name;
-     cipher_class->sign = g_mime_gpgme_sign;
-     cipher_class->verify = g_mime_gpgme_verify;
-     cipher_class->encrypt = g_mime_gpgme_encrypt;
-     cipher_class->decrypt = g_mime_gpgme_decrypt;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto_class->digest_id = g_mime_gpgme_digest_id;
-+    crypto_class->digest_name = g_mime_gpgme_digest_name;
-+    crypto_class->get_signature_protocol =
-+        g_mime_gpgme_get_signature_protocol;
-+    crypto_class->get_encryption_protocol =
-+        g_mime_gpgme_get_encryption_protocol;
-+    crypto_class->get_key_exchange_protocol =
-+        g_mime_gpgme_get_key_exchange_protocol;
-+    crypto_class->sign = g_mime_gpgme_sign;
-+    crypto_class->verify = g_mime_gpgme_verify;
-+    crypto_class->encrypt = g_mime_gpgme_encrypt;
-+    crypto_class->decrypt = g_mime_gpgme_decrypt;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) ==
- 	GPG_ERR_NO_ERROR)
-@@ -190,7 +263,11 @@ g_mime_gpgme_context_finalize(GObject * object)
-     }
- 
- #if !defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
-     g_object_unref(GMIME_CIPHER_CONTEXT(ctx)->session);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(GMIME_CRYPTO_CONTEXT(ctx)->session);
-+#endif /* HAVE_GMIME_2_5_7 */
- #endif                          /* HAVE_GMIME_2_6 */
- 
-     G_OBJECT_CLASS(parent_class)->finalize(object);
-@@ -200,15 +277,26 @@ g_mime_gpgme_context_finalize(GObject * object)
- /*
-  * Convert a hash algorithm name to a number
-  */
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherHash
- g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDigestAlgo
-+g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, const char *hash)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-+#ifndef HAVE_GMIME_2_5_7
-     if (hash == NULL)
- 	return GMIME_CIPHER_HASH_DEFAULT;
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (hash == NULL)
-+	return GMIME_DIGEST_ALGO_DEFAULT;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (!g_ascii_strcasecmp(hash, "pgp-"))
- 	hash += 4;
- 
-+#ifndef HAVE_GMIME_2_5_7
-     if (!g_ascii_strcasecmp(hash, "md2"))
- 	return GMIME_CIPHER_HASH_MD2;
-     else if (!g_ascii_strcasecmp(hash, "md5"))
-@@ -223,6 +311,22 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
- 	return GMIME_CIPHER_HASH_HAVAL5160;
- 
-     return GMIME_CIPHER_HASH_DEFAULT;
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (!g_ascii_strcasecmp(hash, "md2"))
-+	return GMIME_DIGEST_ALGO_MD2;
-+    else if (!g_ascii_strcasecmp(hash, "md5"))
-+	return GMIME_DIGEST_ALGO_MD5;
-+    else if (!g_ascii_strcasecmp(hash, "sha1"))
-+	return GMIME_DIGEST_ALGO_SHA1;
-+    else if (!g_ascii_strcasecmp(hash, "ripemd160"))
-+	return GMIME_DIGEST_ALGO_RIPEMD160;
-+    else if (!g_ascii_strcasecmp(hash, "tiger192"))
-+	return GMIME_DIGEST_ALGO_TIGER192;
-+    else if (!g_ascii_strcasecmp(hash, "haval-5-160"))
-+	return GMIME_DIGEST_ALGO_HAVAL5160;
-+
-+    return GMIME_DIGEST_ALGO_DEFAULT;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -230,7 +334,11 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
-  * Convert a hash algorithm number to a string
-  */
- static const char *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_digest_name(GMimeCryptoContext * context, GMimeDigestAlgo hash)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-     char *p;
-@@ -239,6 +347,7 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     g_return_val_if_fail(ctx->gpgme_ctx, NULL);
- 
-     /* note: this is only a subset of the hash algorithms gpg(me) supports */
-+#ifndef HAVE_GMIME_2_5_7
-     switch (hash) {
-     case GMIME_CIPHER_HASH_MD2:
- 	p = "pgp-md2";
-@@ -258,6 +367,27 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     case GMIME_CIPHER_HASH_HAVAL5160:
- 	p = "pgp-haval-5-160";
- 	break;
-+#else /* HAVE_GMIME_2_5_7 */
-+    switch (hash) {
-+    case GMIME_DIGEST_ALGO_MD2:
-+	p = "pgp-md2";
-+	break;
-+    case GMIME_DIGEST_ALGO_MD5:
-+	p = "pgp-md5";
-+	break;
-+    case GMIME_DIGEST_ALGO_SHA1:
-+	p = "pgp-sha1";
-+	break;
-+    case GMIME_DIGEST_ALGO_RIPEMD160:
-+	p = "pgp-ripemd160";
-+	break;
-+    case GMIME_DIGEST_ALGO_TIGER192:
-+	p = "pgp-tiger192";
-+	break;
-+    case GMIME_DIGEST_ALGO_HAVAL5160:
-+	p = "pgp-haval-5-160";
-+	break;
-+#endif /* HAVE_GMIME_2_5_7 */
-     default:
- 	if (!(p = ctx->micalg))
- 	    return p;
-@@ -270,6 +400,29 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     return p;
- }
- 
-+#ifdef HAVE_GMIME_2_5_7
-+static const char *
-+g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->sign_protocol;
-+}
-+
-+static const char *
-+g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->encrypt_protocol;
-+}
-+
-+static const char *
-+g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->key_protocol;
-+}
-+
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- /*
-  * Wrapper to convert the passphrase returned from the gmime session to gpgme.
-@@ -279,7 +432,11 @@ g_mime_session_passphrase(void *HOOK, const char *UID_HINT,
- 			  const char *PASSPHRASE_INFO, int PREV_WAS_BAD,
- 			  int FD)
- {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext *ctx = GMIME_CIPHER_CONTEXT(HOOK);
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *ctx = GMIME_CRYPTO_CONTEXT(HOOK);
-+#endif /* HAVE_GMIME_2_5_7 */
- #if defined(HAVE_GMIME_2_6)
-     GMimeStream *stream;
-     gboolean rc;
-@@ -366,9 +523,15 @@ cb_data_release(void *handle)
-  * arg, but set the value in the context.
-  */
- static int
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid,
- 		  GMimeCipherHash hash, GMimeStream * istream,
- 		  GMimeStream * ostream, GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_sign(GMimeCryptoContext * context, const char *userid,
-+		  GMimeDigestAlgo hash, GMimeStream * istream,
-+		  GMimeStream * ostream, GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_sig_mode_t sig_mode;
-@@ -460,6 +623,7 @@ g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid,
- }
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- /*
-  * In standard mode, verify that sigstream contains a detached signature for
-  * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime),
-@@ -471,13 +635,33 @@ static GMimeSignatureValidity *
- g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 		    GMimeStream * istream, GMimeStream * sigstream,
- 		    GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+/*
-+ * In standard mode, verify that sigstream contains a detached signature for
-+ * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime),
-+ * istream contains clearsigned data, and sigstream will be filled with the
-+ * verified plaintext. The routine returns a GMimeSignatureList object.
-+ * More information is saved in the context's signature object.
-+ * On error error is set accordingly.
-+ */
-+static GMimeSignatureList *
-+g_mime_gpgme_verify(GMimeCryptoContext * context, GMimeDigestAlgo hash,
-+		    GMimeStream * istream, GMimeStream * sigstream,
-+		    GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-     gpgme_protocol_t protocol;
-     gpgme_error_t err;
-     gpgme_data_t msg, sig;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *list;
-+    GMimeSignature *signature;
-+
-+#endif /* HAVE_GMIME_2_5_7 */
-     struct gpgme_data_cbs cbs = {
- 	(gpgme_data_read_cb_t) g_mime_gpgme_stream_rd,	/* read method */
- 	(gpgme_data_write_cb_t) g_mime_gpgme_stream_wr,	/* write method */
-@@ -521,6 +705,7 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 	ctx->sig_state =
- 	    g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     validity = g_mime_signature_validity_new();
-     if (ctx->sig_state) {
- 	switch (ctx->sig_state->status)
-@@ -536,12 +721,44 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 	    }
-     } else
- 	g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN);
-+#else /* HAVE_GMIME_2_5_7 */
-+    list = g_mime_signature_list_new();
-+    signature = g_mime_signature_new();
-+    g_mime_signature_list_add(list, signature);
-+
-+    if (ctx->sig_state) {
-+	switch (ctx->sig_state->status)
-+	    {
-+	    case GPG_ERR_NO_ERROR:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_GOOD);
-+		break;
-+	    case GPG_ERR_NOT_SIGNED:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_ERROR);
-+		g_mime_signature_set_errors(signature,
-+                                            GMIME_SIGNATURE_ERROR_NONE);
-+		break;
-+	    default:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_BAD);
-+	    }
-+    } else {
-+	g_mime_signature_set_status(signature,
-+                                    GMIME_SIGNATURE_STATUS_ERROR);
-+        g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE);
-+    }
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* release gmgme data buffers */
-     gpgme_data_release(msg);
-     gpgme_data_release(sig);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return list;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -549,10 +766,19 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
-  * Encrypt istream to ostream for recipients. If sign is set, sign by userid.
-  */
- static int
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign,
- 		     const char *userid, GPtrArray * recipients,
- 		     GMimeStream * istream, GMimeStream * ostream,
- 		     GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_encrypt(GMimeCryptoContext * context, gboolean sign,
-+		     const char *userid,
-+                     GMimeDigestAlgo digest,
-+                     GPtrArray * recipients,
-+		     GMimeStream * istream, GMimeStream * ostream,
-+		     GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-@@ -653,9 +879,15 @@ g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign,
-  * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included
-  * signature (if any).
-  */
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeSignatureValidity *
- g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 		     GMimeStream * ostream, GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDecryptResult *
-+g_mime_gpgme_decrypt(GMimeCryptoContext * context, GMimeStream * istream,
-+		     GMimeStream * ostream, GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-@@ -668,7 +900,13 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 	NULL,			/* seek method */
- 	cb_data_release		/* release method */
-     };
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeDecryptResult *result;
-+    GMimeSignatureList *list;
-+    GMimeSignature *signature;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some paranoia checks */
-     g_return_val_if_fail(ctx, NULL);
-@@ -716,6 +954,7 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
-     /* try to get information about the signature (if any) */
-     ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     validity = g_mime_signature_validity_new();
-     if (ctx->sig_state) {
- 	switch (ctx->sig_state->status)
-@@ -733,14 +972,57 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 	g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN);
- 
-     return validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    list = g_mime_signature_list_new();
-+    signature = g_mime_signature_new();
-+    g_mime_signature_list_add(list, signature);
-+    result = g_mime_decrypt_result_new();
-+    g_mime_decrypt_result_set_signatures(result, list);
-+
-+    if (ctx->sig_state) {
-+	switch (ctx->sig_state->status)
-+	    {
-+	    case GPG_ERR_NO_ERROR:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_GOOD);
-+		break;
-+	    case GPG_ERR_NOT_SIGNED:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_ERROR);
-+		g_mime_signature_set_errors(signature,
-+                                            GMIME_SIGNATURE_ERROR_NONE);
-+		break;
-+	    default:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_BAD);
-+	    }
-+    } else {
-+	g_mime_signature_set_status(signature,
-+                                    GMIME_SIGNATURE_STATUS_ERROR);
-+        g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE);
-+    }
-+
-+    return result;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- /*
-  * Create a new gpgme cipher context with protocol. If anything fails, return
-  * NULL and set error.
-  */
-+#else /* HAVE_GMIME_2_5_7 */
-+/*
-+ * Create a new gpgme crypto context with protocol. If anything fails, return
-+ * NULL and set error.
-+ */
-+#endif /* HAVE_GMIME_2_5_7 */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeCipherContext *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeCryptoContext *
-+#endif /* HAVE_GMIME_2_5_7 */
- #if defined(HAVE_GMIME_2_6)
- g_mime_gpgme_context_new(GMimePasswordRequestFunc request_passwd,
-                          gpgme_protocol_t protocol, GError ** error)
-@@ -749,7 +1031,11 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 			 gpgme_protocol_t protocol, GError ** error)
- #endif                          /* HAVE_GMIME_2_6 */
- {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext *cipher;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *crypto;
-+#endif /* HAVE_GMIME_2_5_7 */
-     GMimeGpgmeContext *ctx;
-     gpgme_error_t err;
-     gpgme_ctx_t gpgme_ctx;
-@@ -766,14 +1052,22 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 	return NULL;
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     /* create the cipher context */
-+#else /* HAVE_GMIME_2_5_7 */
-+    /* create the crypto context */
-+#endif /* HAVE_GMIME_2_5_7 */
-     ctx = g_object_new(GMIME_TYPE_GPGME_CONTEXT, NULL, NULL);
-     if (!ctx) {
- 	gpgme_release(gpgme_ctx);
- 	return NULL;
-     } else
- 	ctx->gpgme_ctx = gpgme_ctx;
-+#ifndef HAVE_GMIME_2_5_7
-     cipher = (GMimeCipherContext *) ctx;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto = (GMimeCryptoContext *) ctx;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* check if the requested protocol is available */
-     if (!g_mime_gpgme_context_check_protocol
-@@ -785,23 +1079,47 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 
-     /* setup according to requested protocol */
- #if defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
-     cipher->request_passwd = request_passwd;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto->request_passwd = request_passwd;
-+#endif /* HAVE_GMIME_2_5_7 */
- #else                           /* HAVE_GMIME_2_6 */
-+#ifndef HAVE_GMIME_2_5_7
-     cipher->session = session;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto->session = session;
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_object_ref(session);
- #endif                          /* HAVE_GMIME_2_6 */
-     gpgme_set_protocol(gpgme_ctx, protocol);
-     if (protocol == GPGME_PROTOCOL_OpenPGP) {
-+#ifndef HAVE_GMIME_2_5_7
- 	cipher->sign_protocol = "application/pgp-signature";
- 	cipher->encrypt_protocol = "application/pgp-encrypted";
- 	cipher->key_protocol = NULL;	/* FIXME */
-+#else /* HAVE_GMIME_2_5_7 */
-+	ctx->sign_protocol = "application/pgp-signature";
-+	ctx->encrypt_protocol = "application/pgp-encrypted";
-+	ctx->key_protocol = NULL;	/* FIXME */
-+#endif /* HAVE_GMIME_2_5_7 */
-     } else {
-+#ifndef HAVE_GMIME_2_5_7
- 	cipher->sign_protocol = "application/pkcs7-signature";
- 	cipher->encrypt_protocol = "application/pkcs7-mime";
- 	cipher->key_protocol = NULL;	/* FIXME */
-+#else /* HAVE_GMIME_2_5_7 */
-+	ctx->sign_protocol = "application/pkcs7-signature";
-+	ctx->encrypt_protocol = "application/pkcs7-mime";
-+	ctx->key_protocol = NULL;	/* FIXME */
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return cipher;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return crypto;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-diff --git a/libbalsa/gmime-gpgme-context.h b/libbalsa/gmime-gpgme-context.h
-index 585d927..19c5fae 100644
---- a/libbalsa/gmime-gpgme-context.h
-+++ b/libbalsa/gmime-gpgme-context.h
-@@ -63,7 +63,11 @@ typedef gboolean(*GMimeGpgmeKeyTrustCB) (const gchar * name,
- 					 GMimeGpgmeContext * ctx);
- 
- struct _GMimeGpgmeContext {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext parent_object;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext parent_object;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     gpgme_ctx_t gpgme_ctx;	/* gpgme context */
-     gboolean singlepart_mode;	/* set context to single-part mode (RFC 2440, 2633) */
-@@ -73,11 +77,21 @@ struct _GMimeGpgmeContext {
-     GMimeGpgmeKeySelectCB key_select_cb;	/* key selection callback */
-     GMimeGpgmeKeyTrustCB key_trust_cb;          /* low trust key cb */
-     gpgme_passphrase_cb_t passphrase_cb;	/* passphrase callback */
-+#ifdef HAVE_GMIME_2_5_7
-+
-+    const gchar *sign_protocol;
-+    const gchar *encrypt_protocol;
-+    const gchar *key_protocol;
-+#endif /* HAVE_GMIME_2_5_7 */
- };
- 
- 
- struct _GMimeGpgmeContextClass {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContextClass parent_class;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContextClass parent_class;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     gboolean has_proto_openpgp;
-     gboolean has_proto_cms;
-@@ -86,10 +100,17 @@ struct _GMimeGpgmeContextClass {
- 
- GType g_mime_gpgme_context_get_type(void);
- #if defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
- GMimeCipherContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc
-                                              request_passwd,
- 					     gpgme_protocol_t protocol,
- 					     GError ** error);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeCryptoContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc
-+                                             request_passwd,
-+					     gpgme_protocol_t protocol,
-+					     GError ** error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #else                           /* HAVE_GMIME_2_6 */
- GMimeCipherContext *g_mime_gpgme_context_new(GMimeSession * session,
- 					     gpgme_protocol_t protocol,
-diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
-index 795d2e1..e79c4cb 100644
---- a/libbalsa/gmime-part-rfc2440.c
-+++ b/libbalsa/gmime-part-rfc2440.c
-@@ -112,8 +112,13 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), -1);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL,
- 			 -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail(recipients != NULL || sign_userid != NULL, -1);
- 
-     /* get the raw content */
-@@ -131,14 +136,27 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
-     ctx->singlepart_mode = TRUE;
-     if (recipients == NULL)
- 	result =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid,
- 			       GMIME_CIPHER_HASH_DEFAULT, stream,
- 			       cipherstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_crypto_context_sign(GMIME_CRYPTO_CONTEXT(ctx), sign_userid,
-+			       GMIME_CIPHER_ALGO_DEFAULT, stream,
-+			       cipherstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
-     else
- 	result =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx),
- 				  sign_userid != NULL, sign_userid,
- 				  recipients, stream, cipherstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_crypto_context_encrypt(GMIME_CRYPTO_CONTEXT(ctx),
-+				  sign_userid != NULL, sign_userid,
-+                                  GMIME_CIPHER_ALGO_DEFAULT,
-+				  recipients, stream, cipherstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
-     if (result == -1) {
- 	g_object_unref(cipherstream);
- 	return -1;
-@@ -202,18 +220,31 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
-  * set on err to provide more information. Upon success, the content
-  * of part is replaced by the verified output of the crypto engine.
-  */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeSignatureList *
-+#endif /* HAVE_GMIME_2_5_7 */
- g_mime_part_rfc2440_verify(GMimePart * part,
- 			   GMimeGpgmeContext * ctx, GError ** err)
- {
-     GMimeStream *stream, *plainstream;
-     GMimeDataWrapper * wrapper;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *list;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL,
- 			 NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* get the raw content */
-     wrapper = g_mime_part_get_content_object(GMIME_PART(part));
-@@ -227,13 +258,25 @@ g_mime_part_rfc2440_verify(GMimePart * part,
- 
-     /* verify the signature */
-     ctx->singlepart_mode = TRUE;
-+#ifndef HAVE_GMIME_2_5_7
-     valid =
- 	g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx),
- 			     GMIME_CIPHER_HASH_DEFAULT, stream,
- 			     plainstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+    list =
-+	g_mime_crypto_context_verify(GMIME_CRYPTO_CONTEXT(ctx),
-+			     GMIME_CIPHER_ALGO_DEFAULT, stream,
-+			     plainstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* upon success, replace the signed content by the checked one */
--    if (valid) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (valid)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (list)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	GMimeDataWrapper *wrapper = g_mime_data_wrapper_new();
- 
- 	g_mime_data_wrapper_set_stream(wrapper, plainstream);
-@@ -242,7 +285,11 @@ g_mime_part_rfc2440_verify(GMimePart * part,
-     }
-     g_object_unref(plainstream);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return list;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -255,19 +302,32 @@ g_mime_part_rfc2440_verify(GMimePart * part,
-  * verified and the result is placed in ctx by the underlying gpgme
-  * context.
-  */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeDecryptResult *
-+#endif /* HAVE_GMIME_2_5_7 */
- g_mime_part_rfc2440_decrypt(GMimePart * part,
- 			    GMimeGpgmeContext * ctx, GError ** err)
- {
-     GMimeStream *stream, *plainstream;
-     GMimeDataWrapper * wrapper;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *result;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeDecryptResult *result;
-+#endif /* HAVE_GMIME_2_5_7 */
-     gchar *headbuf = g_malloc0(1024);
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol !=
- 			 NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* get the raw content */
-     wrapper = g_mime_part_get_content_object(part);
-@@ -284,8 +344,13 @@ g_mime_part_rfc2440_decrypt(GMimePart * part,
- 
-     /* decrypt and (if possible) verify the input */
-     result =
-+#ifndef HAVE_GMIME_2_5_7
- 	g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream,
- 			      plainstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	g_mime_crypto_context_decrypt(GMIME_CRYPTO_CONTEXT(ctx), stream,
-+                                      plainstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (result != NULL) {
- 	GMimeStream *filter_stream;
-diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h
-index 48be5a4..cc1901a 100644
---- a/libbalsa/gmime-part-rfc2440.h
-+++ b/libbalsa/gmime-part-rfc2440.h
-@@ -53,12 +53,21 @@ int g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
- 				     GPtrArray * recipients,
- 				     const char *sign_userid,
- 				     GError ** err);
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part,
- 						   GMimeGpgmeContext * ctx,
- 						   GError ** err);
- GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part,
-                                                     GMimeGpgmeContext *
-                                                     ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeSignatureList *g_mime_part_rfc2440_verify(GMimePart * part,
-+                                               GMimeGpgmeContext * ctx,
-+                                               GError ** err);
-+GMimeDecryptResult *g_mime_part_rfc2440_decrypt(GMimePart * part,
-+                                                GMimeGpgmeContext * ctx,
-+                                                GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #ifdef __cplusplus
- }
-diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
-index a56e12c..df4a2e1 100644
---- a/libbalsa/rfc3156.c
-+++ b/libbalsa/rfc3156.c
-@@ -268,9 +268,15 @@ libbalsa_message_body_protection(LibBalsaMessageBody * body)
- 
- #if defined(HAVE_GMIME_2_6)
- static gboolean
-+#ifndef HAVE_GMIME_2_5_7
- password_request_func(GMimeCipherContext * ctx, const char *user_id,
-                       const char *prompt_ctx, gboolean reprompt,
-                       GMimeStream * response, GError ** err)
-+#else /* HAVE_GMIME_2_5_7 */
-+password_request_func(GMimeCryptoContext * ctx, const char *user_id,
-+                      const char *prompt_ctx, gboolean reprompt,
-+                      GMimeStream * response, GError ** err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     gint fd;
-     gchar *name_used;
-@@ -366,9 +372,16 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for,
- 	return FALSE;
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     if (g_mime_multipart_signed_sign
- 	(mps, *content, GMIME_CIPHER_CONTEXT(ctx), rfc822_for,
--	 GMIME_CIPHER_HASH_DEFAULT, error) != 0) {
-+	 GMIME_CIPHER_HASH_DEFAULT, error) != 0)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_multipart_signed_sign
-+	(mps, *content, GMIME_CRYPTO_CONTEXT(ctx), rfc822_for,
-+	 GMIME_DIGEST_ALGO_DEFAULT, error) != 0)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(mps);
- 	g_object_unref(ctx);
- #if !defined(HAVE_GMIME_2_6)
-@@ -458,10 +471,18 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
- 
- 	encrypted_obj = GMIME_OBJECT(mpe);
- 	result = 
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_multipart_encrypted_encrypt(mpe, *content,
- 					       GMIME_CIPHER_CONTEXT(ctx),
-                                                FALSE, NULL,
- 					       recipients, error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_multipart_encrypted_encrypt(mpe, *content,
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+                                               FALSE, NULL,
-+                                               GMIME_DIGEST_ALGO_DEFAULT,
-+					       recipients, error);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- #ifdef HAVE_SMIME
-     else {
-@@ -471,9 +492,15 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
- 	encrypted_obj = GMIME_OBJECT(pkcs7);
- 	ctx->singlepart_mode = TRUE;
- 	result = 
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_application_pkcs7_encrypt(pkcs7, *content,
- 					     GMIME_CIPHER_CONTEXT(ctx),
- 					     recipients, error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_application_pkcs7_encrypt(pkcs7, *content,
-+					     GMIME_CRYPTO_CONTEXT(ctx),
-+					     recipients, error);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- #endif
- 
-@@ -565,8 +592,14 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- #if !defined(HAVE_GMIME_2_6)
-     GMimeSession *session;
- #endif                          /* HAVE_GMIME_2_6 */
--    GMimeCipherContext *ctx;
-+#ifndef HAVE_GMIME_2_5_7
-+    GMimeCipherContext *g_mime_ctx;
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *g_mime_ctx;
-+    GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
-+    GMimeGpgmeContext *ctx;
-     GError *error = NULL;
- 
-     /* paranoia checks */
-@@ -592,12 +625,12 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
-     /* try to create GMimeGpgMEContext */
- #if !defined(HAVE_GMIME_2_6)
-     session = g_object_new(g_mime_session_get_type(), NULL, NULL);
--    ctx = g_mime_gpgme_context_new(session, protocol, &error);
-+    g_mime_ctx = g_mime_gpgme_context_new(session, protocol, &error);
- #else                           /* HAVE_GMIME_2_6 */
--    ctx =
-+    g_mime_ctx =
-         g_mime_gpgme_context_new(password_request_func, protocol, &error);
- #endif                          /* HAVE_GMIME_2_6 */
--    if (ctx == NULL) {
-+    if (g_mime_ctx == NULL) {
- 	if (error) {
- 	    libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s",
- 				 _("creating a gpgme context failed"),
-@@ -613,6 +646,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	body->parts->next->sig_info->status = GPGME_SIG_STAT_ERROR;
- 	return FALSE;
-     }
-+    ctx = GMIME_GPGME_CONTEXT(g_mime_ctx);
- 
-     /* S/MIME uses the protocol application/pkcs7-signature, but some ancient
-        mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature,
-@@ -622,14 +656,19 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	    g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part),
- 						     "protocol");
- 	if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature"))
-+#ifndef HAVE_GMIME_2_5_7
-+	    g_mime_ctx->sign_protocol = cms_protocol;
-+#else /* HAVE_GMIME_2_5_7 */
- 	    ctx->sign_protocol = cms_protocol;
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-     /* verify the signature */
- 
-     libbalsa_mailbox_lock_store(body->message->mailbox);
-     valid = g_mime_multipart_signed_verify(GMIME_MULTIPART_SIGNED
--					   (body->mime_part), ctx, &error);
-+					   (body->mime_part), g_mime_ctx,
-+                                           &error);
-     libbalsa_mailbox_unlock_store(body->message->mailbox);
- 
-     if (valid == NULL) {
-@@ -642,12 +681,16 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	    libbalsa_information(LIBBALSA_INFORMATION_ERROR,
- 				 _("signature verification failed"));
-     }
--    if (GMIME_GPGME_CONTEXT(ctx)->sig_state) {
--	body->parts->next->sig_info = GMIME_GPGME_CONTEXT(ctx)->sig_state;
-+    if (ctx->sig_state) {
-+	body->parts->next->sig_info = ctx->sig_state;
- 	g_object_ref(G_OBJECT(body->parts->next->sig_info));
-     }
-+#ifndef HAVE_GMIME_2_5_7
-     g_mime_signature_validity_free(valid);
--    g_object_unref(ctx);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(valid);
-+#endif /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(g_mime_ctx);
- #if !defined(HAVE_GMIME_2_6)
-     g_object_unref(session);
- #endif                          /* HAVE_GMIME_2_6 */
-@@ -747,14 +790,26 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body,
-     libbalsa_mailbox_lock_store(body->message->mailbox);
-     if (protocol == GPGME_PROTOCOL_OpenPGP)
- 	mime_obj =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part),
- 					       GMIME_CIPHER_CONTEXT(ctx),
- 					       &error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part),
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+                                               NULL,
-+					       &error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #ifdef HAVE_SMIME
-     else if (smime_signed) {
-+#ifndef HAVE_GMIME_2_5_7
- 	GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+	GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 	ctx->singlepart_mode = TRUE;
-+#ifndef HAVE_GMIME_2_5_7
- 	mime_obj =
- 	    g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part),
- 					    &valid,
-@@ -766,6 +821,19 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body,
- 	    g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part),
- 					       GMIME_CIPHER_CONTEXT(ctx),
- 					       &error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	mime_obj =
-+	    g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part),
-+					    &valid,
-+					    GMIME_CRYPTO_CONTEXT(ctx),
-+					    &error);
-+	g_object_unref(valid);
-+    } else
-+	mime_obj =
-+	    g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part),
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+					       &error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #endif
-     libbalsa_mailbox_unlock_store(body->message->mailbox);
- 
-@@ -906,7 +974,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
-     GMimeSession *session;
- #endif                          /* HAVE_GMIME_2_6 */
-     GMimeGpgmeContext *ctx;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
-     GError *error = NULL;
-     gpgme_error_t retval;
- 
-@@ -978,7 +1050,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
-     }
- 
-     /* clean up */
-+#ifndef HAVE_GMIME_2_5_7
-     g_mime_signature_validity_free(valid);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(valid);
-+#endif /* HAVE_GMIME_2_5_7 */
-     retval = ctx->sig_state->status;
-     g_object_unref(ctx);
- #if !defined(HAVE_GMIME_2_6)
---
-cgit v0.9.0.2
diff --git a/community-testing/dsniff/PKGBUILD b/community-testing/dsniff/PKGBUILD
deleted file mode 100644
index d705f8887..000000000
--- a/community-testing/dsniff/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 61872 2012-01-09 18:49:25Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: ViNS <gladiator@fastwebnet.it>
-
-pkgname=dsniff
-pkgver=2.4b1
-pkgrel=21
-pkgdesc="Collection of tools for network auditing and penetration testing"
-url="http://www.monkey.org/~dugsong/dsniff/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids')
-source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
-        "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz")
-md5sums=('2f761fa3475682a7512b0b43568ee7d6'
-         'fbc9f62f9ab2f98f24f53ad497c1ce5d')
-
-build() {
-  cd $srcdir/$pkgname-2.4
-  patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff
-  for i in *.dpatch; do
-    patch -N < "$i"
-  done
-
-  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-2.4
-  make prefix="$pkgdir"/usr install
-  install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
-
-  install -d "$pkgdir"/usr/share
-  mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
-}
diff --git a/community-testing/exim/ChangeLog b/community-testing/exim/ChangeLog
deleted file mode 100644
index 80a101472..000000000
--- a/community-testing/exim/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2011-10-10 Angel Velasquez <angvp@archlinux.org>
-	* Updated to 4.77
-
-2011-07-15 Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt without tcp_wrappers
-	* Fixing logrotate issue FS#25094
-	* ChangeLog file changed name from exim.changelog to ChangeLog
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Rebuilt against db 5.2.28
-
-2010-05-09 Angel Velasquez <angvp@archlinux.org>
-    * Updated to 4.76
-    * Removed previous patch since is no longer needed
-    * Removed newaliases script FS#22744
-    * Removed sudo dependency
-
-2010-05-07 Angel Velasquez <angvp@archlinux.org>
-    * Adding patch for security issue see: http://goo.gl/QBict
-
-2010-05-06 Angel Velasquez <angvp@archlinux.org>
-    * Setting sticky id to deliver mail. Closes FS#24109 
-
-2010-04-30 Angel Velasquez <angvp@archlinux.org>
-    * exim 4.75
-    * Config updated with the aliases path. Closes FS#22743
-    * Removed sed hackings and added a exim.Makefile . Closes FS#22744
-    * Replaced creation of the user at build time. Closes FS#22745
-
diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD
deleted file mode 100644
index 31ad9632f..000000000
--- a/community-testing/exim/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 61874 2012-01-09 18:49:46Z stephane $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=exim
-pkgver=4.77
-pkgrel=2
-pkgdesc="Message Transfer Agent"
-arch=('x86_64' 'i686')
-url="http://www.exim.org/"
-license=('GPL')
-backup=(etc/mail/aliases etc/mail/exim.conf \
-        etc/logrotate.d/exim etc/conf.d/exim)
-install=exim.install
-changelog=ChangeLog
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
-provides=('smtp-server')
-conflicts=('smtp-server')
-options=('!makeflags')
-source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2"
-        aliases
-        exim
-        exim.logrotate
-        exim.conf.d
-        exim.Makefile)
-sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
-  install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
-  install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
-  install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim
-  mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \
-    ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin}
-  chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim
-  cd build-Linux-*
-  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\
-          exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\
-          exim_fixdb eximstats exinext exiqgrep exiwhat; do
-          install -m 0755 "$i" "$pkgdir/usr/sbin"
-  done
-
-  cd "$srcdir/exim-$pkgver/src"
-  sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
-      -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \
-      >"$pkgdir/etc/mail/exim.conf"
-
-  cp "$srcdir/aliases" "$pkgdir/etc/mail"
-  cd "$pkgdir/usr/sbin"
-  for i in mailq rmail rsmtp runq sendmail; do
-      ln -s exim "$i"
-  done
-  # fhs compliancy
-  ln -s ../sbin/exim ../lib/sendmail
-
-  mkdir -p "$pkgdir/etc/rc.d"
-  cp "$srcdir/exim" "$pkgdir/etc/rc.d"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases
deleted file mode 100644
index 5a76ff7d5..000000000
--- a/community-testing/exim/aliases
+++ /dev/null
@@ -1,35 +0,0 @@
-#  
-#  /etc/mail/aliases
-#
-#  NOTE:  Make sure you run 'newaliases' after modifying this file
-#
-
-# Basic system aliases -- these MUST be present.
-MAILER-DAEMON:	postmaster
-postmaster:	root
-hostmaster:	root
-webmaster:	hostmaster
-ftpmaster:	hostmaster
-admin:		hostmaster
-administrator:	hostmaster
-
-# General redirections for pseudo accounts.
-bin:		root
-daemon:		root
-games:		root
-ingres:		root
-nobody:		root
-system:		root
-toor:		root
-uucp:		root
-
-# Well-known aliases.
-manager:	root
-dumper:		root
-operator:	root
-
-# trap decode to catch security attacks
-decode:		root
-
-# Person who should get root's mail
-#root:
diff --git a/community-testing/exim/exim b/community-testing/exim/exim
deleted file mode 100644
index 8e9640b32..000000000
--- a/community-testing/exim/exim
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/exim`
-
-case "$1" in
-  start)
-    stat_busy "Starting Exim"
-    [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon exim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Exim"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/exim.pid
-      rm_daemon exim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile
deleted file mode 100644
index a304ce829..000000000
--- a/community-testing/exim/exim.Makefile
+++ /dev/null
@@ -1,1227 +0,0 @@
-# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $
-
-##################################################
-#          The Exim mail transport agent         #
-##################################################
-
-# This is the template for Exim's main build-time configuration file. It
-# contains settings that are independent of any operating system. These are
-# things that are mostly sysadmin choices. The items below are divided into
-# those you must specify, those you probably want to specify, those you might
-# often want to specify, and those that you almost never need to mention.
-
-# Edit this file and save the result to a file called Local/Makefile within the
-# Exim distribution directory before running the "make" command.
-
-# Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
-
-# However, if you are building Exim for a single OS only, you don't need to
-# worry about setting up Local/Makefile-<osname>. Any build-time configuration
-# settings you require can in fact be placed in the one file called
-# Local/Makefile. It is only if you are building for several OS from the same
-# source files that you need to worry about splitting off your own OS-dependent
-# settings into separate files. (There's more explanation about how this all
-# works in the toplevel README file, under "Modifying the building process", as
-# well as in the Exim specification.)
-
-# One OS-specific thing that may need to be changed is the command for running
-# the C compiler; the overall default is gcc, but some OS Makefiles specify cc.
-# You can override anything that is set by putting CC=whatever in your
-# Local/Makefile.
-
-# NOTE: You should never need to edit any of the distributed Makefiles; all
-# overriding can be done in your Local/Makefile(s). This will make it easier
-# for you when the next release comes along.
-
-# The location of the X11 libraries is something else that is quite variable
-# even between different versions of the same operating system (and indeed
-# there are different versions of X11 as well, of course). The four settings
-# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
-# (dynamic run-time library). You need not worry about X11 unless you want to
-# compile the Exim monitor utility. Exim itself does not use X11.
-
-# Another area of variability between systems is the type and location of the
-# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB.
-# By default the code assumes ndbm; this often works with gdbm or DB, provided
-# they are correctly installed, via their compatibility interfaces. However,
-# Exim can also be configured to use the native calls for Berkeley DB (obsolete
-# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm.
-
-# For some operating systems, a default DBM library (other than ndbm) is
-# selected by a setting in the OS-specific Makefile. Most modern OS now have
-# a DBM library installed as standard, and in many cases this will be selected
-# for you by the OS-specific configuration. If Exim compiles without any
-# problems, you probably do not have to worry about the DBM library. If you
-# do want or need to change it, you should first read the discussion in the
-# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's
-# interface to the DBM library.
-
-# In Local/Makefiles blank lines and lines starting with # are ignored. It is
-# also permitted to use the # character to add a comment to a setting, for
-# example
-#
-# EXIM_GID=42   # the "mail" group
-#
-# However, with some versions of "make" this works only if there is no white
-# space between the end of the setting and the #, so perhaps it is best
-# avoided. A consequence of this facility is that it is not possible to have
-# the # character present in any setting, but I can't think of any cases where
-# this would be wanted.
-###############################################################################
-
-
-
-###############################################################################
-#                    THESE ARE THINGS YOU MUST SPECIFY                        #
-###############################################################################
-
-# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and
-# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number.
-
-# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it
-# really is a very good idea to specify it here rather than at run time. This
-# is particularly true if you let the logs go to their default location in the
-# spool directory, because it means that the location of the logs is known
-# before Exim has read the run time configuration file.
-
-#------------------------------------------------------------------------------
-# BIN_DIRECTORY defines where the exim binary will be installed by "make
-# install". The path is also used internally by Exim when it needs to re-invoke
-# itself, either to send an error message, or to recover root privilege. Exim's
-# utility binaries and scripts are also installed in this directory. There is
-# no "standard" place for the binary directory. Some people like to keep all
-# the Exim files under one directory such as /usr/exim; others just let the
-# Exim binaries go into an existing directory such as /usr/sbin or
-# /usr/local/sbin. The installation script will try to create this directory,
-# and any superior directories, if they do not exist.
-
-BIN_DIRECTORY=/usr/sbin
-
-
-#------------------------------------------------------------------------------
-# CONFIGURE_FILE defines where Exim's run time configuration file is to be
-# found. It is the complete pathname for the file, not just a directory. The
-# location of all other run time files and directories can be changed in the
-# run time configuration file. There is a lot of variety in the choice of
-# location in different OS, and in the preferences of different sysadmins. Some
-# common locations are in /etc or /etc/mail or /usr/local/etc or
-# /usr/local/etc/mail. Another possibility is to keep all the Exim files under
-# a single directory such as /usr/exim. Whatever you choose, the installation
-# script will try to make the directory and any superior directories if they
-# don't exist. It will also install a default runtime configuration if this
-# file does not exist.
-
-CONFIGURE_FILE=/etc/mail/exim.conf
-
-# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
-# In this case, Exim will use the first of them that exists when it is run.
-# However, if a list is specified, the installation script no longer tries to
-# make superior directories or to install a default runtime configuration.
-
-
-#------------------------------------------------------------------------------
-# The Exim binary must normally be setuid root, so that it starts executing as
-# root, but (depending on the options with which it is called) it does not
-# always need to retain the root privilege. These settings define the user and
-# group that is used for Exim processes when they no longer need to be root. In
-# particular, this applies when receiving messages and when doing remote
-# deliveries. (Local deliveries run as various non-root users, typically as the
-# owner of a local mailbox.) Specifying these values as root is not supported.
-
-EXIM_USER=ref:exim
-
-# If you specify EXIM_USER as a name, this is looked up at build time, and the
-# uid number is built into the binary. However, you can specify that this
-# lookup is deferred until runtime. In this case, it is the name that is built
-# into the binary. You can do this by a setting of the form:
-
-# EXIM_USER=ref:exim
-
-# In other words, put "ref:" in front of the user name. If you set EXIM_USER
-# like this, any value specified for EXIM_GROUP is also passed "by reference".
-# Although this costs a bit of resource at runtime, it is convenient to use
-# this feature when building binaries that are to be run on multiple systems
-# where the name may refer to different uids. It also allows you to build Exim
-# on a system where there is no Exim user defined.
-
-# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
-# also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
-# you want to use a group other than the default group for the given user.
-
-# EXIM_GROUP=
-
-# Many sites define a user called "exim", with an appropriate default group,
-# and use
-#
-# EXIM_USER=exim
-#
-# while leaving EXIM_GROUP unspecified (commented out).
-
-
-#------------------------------------------------------------------------------
-# SPOOL_DIRECTORY defines the directory where all the data for messages in
-# transit is kept. It is strongly recommended that you define it here, though
-# it is possible to leave this till the run time configuration.
-
-# Exim creates the spool directory if it does not exist. The owner and group
-# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to
-# all the files and directories that are created in the spool directory.
-
-# Almost all installations choose this:
-
-SPOOL_DIRECTORY=/var/spool/exim
-
-
-
-###############################################################################
-#           THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY                     #
-###############################################################################
-
-# If you need extra header file search paths on all compiles, put the -I
-# options in INCLUDE.  If you want the extra searches only for certain
-# parts of the build, see more specific xxx_INCLUDE variables below.
-
-# INCLUDE=-I/example/include
-
-# You need to specify some routers and transports if you want the Exim that you
-# are building to be capable of delivering mail. You almost certainly need at
-# least one type of lookup. You should consider whether you want to build
-# the Exim monitor or not.
-
-
-#------------------------------------------------------------------------------
-# These settings determine which individual router drivers are included in the
-# Exim binary. There are no defaults in the code; those routers that are wanted
-# must be defined here by setting the appropriate variables to the value "yes".
-# Including a router in the binary does not cause it to be used automatically.
-# It has also to be configured in the run time configuration file. By
-# commenting out those you know you don't want to use, you can make the binary
-# a bit smaller. If you are unsure, leave all of these included for now.
-
-ROUTER_ACCEPT=yes
-ROUTER_DNSLOOKUP=yes
-ROUTER_IPLITERAL=yes
-ROUTER_MANUALROUTE=yes
-ROUTER_QUERYPROGRAM=yes
-ROUTER_REDIRECT=yes
-
-# This one is very special-purpose, so is not included by default.
-
-# ROUTER_IPLOOKUP=yes
-
-
-#------------------------------------------------------------------------------
-# These settings determine which individual transport drivers are included in
-# the Exim binary. There are no defaults; those transports that are wanted must
-# be defined here by setting the appropriate variables to the value "yes".
-# Including a transport in the binary does not cause it to be used
-# automatically. It has also to be configured in the run time configuration
-# file. By commenting out those you know you don't want to use, you can make
-# the binary a bit smaller. If you are unsure, leave all of these included for
-# now.
-
-TRANSPORT_APPENDFILE=yes
-TRANSPORT_AUTOREPLY=yes
-TRANSPORT_PIPE=yes
-TRANSPORT_SMTP=yes
-
-# This one is special-purpose, and commonly not required, so it is not
-# included by default.
-
-TRANSPORT_LMTP=yes
-
-
-#------------------------------------------------------------------------------
-# The appendfile transport can write messages to local mailboxes in a number
-# of formats. The code for three specialist formats, maildir, mailstore, and
-# MBX, is included only when requested. If you do not know what this is about,
-# leave these settings commented out.
-
-SUPPORT_MAILDIR=yes
-# SUPPORT_MAILSTORE=yes
-# SUPPORT_MBX=yes
-
-
-#------------------------------------------------------------------------------
-# See below for dynamic lookup modules.
-# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
-# If not using package management but using this anyway, then think about how
-# you perform upgrades and revert them. You should consider the benefit of
-# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can
-# maintain two concurrent sets of modules.
-
-# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for
-# your platform.  Eg:
-# CFLAGS_DYNAMIC=-shared -rdynamic
-# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
-
-#------------------------------------------------------------------------------
-# These settings determine which file and database lookup methods are included
-# in the binary. See the manual chapter entitled "File and database lookups"
-# for discussion. DBM and lsearch (linear search) are included by default. If
-# you are unsure about the others, leave them commented out for now.
-# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is
-# for the specialist case of using the DNS as a general database facility (not
-# common).
-# If set to "2" instead of "yes" then the corresponding lookup will be
-# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to
-# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to
-# EXTRALIBS so that dlopen() is available to Exim. You need to define
-# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup
-# modules.
-# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and
-# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS
-# (where * is the name as given here in this list). That ensures that only
-# the dynamic library and not the exim binary will be linked against the
-# library.
-# NOTE: LDAP cannot be built as a module!
-
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-LOOKUP_DNSDB=yes
-
-# LOOKUP_CDB=yes
-LOOKUP_DSEARCH=yes
-# LOOKUP_IBASE=yes
-LOOKUP_LDAP=yes
-# LOOKUP_MYSQL=yes
-# LOOKUP_NIS=yes
-# LOOKUP_NISPLUS=yes
-# LOOKUP_ORACLE=yes
-# LOOKUP_PASSWD=yes
-# LOOKUP_PGSQL=yes
-# LOOKUP_SQLITE=yes
-# LOOKUP_WHOSON=yes
-
-# These two settings are obsolete; all three lookups are compiled when
-# LOOKUP_LSEARCH is enabled. However, we retain these for backward
-# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set.
-
-# LOOKUP_WILDLSEARCH=yes
-# LOOKUP_NWILDLSEARCH=yes
-
-
-#------------------------------------------------------------------------------
-# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
-# which LDAP library you have. Unfortunately, though most of their functions
-# are the same, there are minor differences. Currently Exim knows about four
-# LDAP libraries: the one from the University of Michigan (also known as
-# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes
-# with Solaris 7 onwards. Uncomment whichever of these you are using.
-
-# LDAP_LIB_TYPE=OPENLDAP1
-LDAP_LIB_TYPE=OPENLDAP2
-# LDAP_LIB_TYPE=NETSCAPE
-# LDAP_LIB_TYPE=SOLARIS
-
-# If you don't set any of these, Exim assumes the original University of
-# Michigan (OpenLDAP 1) library.
-
-
-#------------------------------------------------------------------------------
-# The PCRE library is required for exim.  There is no longer an embedded
-# version of the PCRE library included with the source code, instead you
-# must use a system library or build your own copy of PCRE.
-# In either case you must specify the library link info here.  If the
-# PCRE header files are not in the standard search path you must also
-# modify the INCLUDE path (above)
-# The default setting of PCRE_LIBS should work on the vast majority of
-# systems
-
-PCRE_LIBS=-lpcre
-
-
-#------------------------------------------------------------------------------
-# Additional libraries and include directories may be required for some
-# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on
-# the command for linking Exim itself, not on any auxiliary programs. You
-# don't need to set LOOKUP_INCLUDE if the relevant directories are already
-# specified in INCLUDE. The settings below are just examples; -lpq is for
-# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
-
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
-
-
-#------------------------------------------------------------------------------
-# Compiling the Exim monitor: If you want to compile the Exim monitor, a
-# program that requires an X11 display, then EXIM_MONITOR should be set to the
-# value "eximon.bin". Comment out this setting to disable compilation of the
-# monitor. The locations of various X11 directories for libraries and include
-# files are defaulted in the OS/Makefile-Default file, but can be overridden in
-# local OS-specific make files.
-
-
-
-
-#------------------------------------------------------------------------------
-# Compiling Exim with content scanning support: If you want to compile Exim
-# with support for message body content scanning, set WITH_CONTENT_SCAN to
-# the value "yes". This will give you malware and spam scanning in the DATA ACL,
-# and the MIME ACL. Please read the documentation to learn more about these
-# features.
-
-WITH_CONTENT_SCAN=yes
-
-# If you want to use the deprecated "demime" condition in the DATA ACL,
-# uncomment the line below. Doing so will also explicitly turn on the
-# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
-# the "demime" condition.
-
-WITH_OLD_DEMIME=yes
-
-# If you're using ClamAV and are backporting fixes to an old version, instead
-# of staying current (which is the more usual approach) then you may need to
-# use an older API which uses a STREAM command, now deprecated, instead of
-# zINSTREAM.  If you need to set this, please let the Exim developers know, as
-# if nobody reports a need for it, we'll remove this option and clean up the
-# code.  zINSTREAM was introduced with ClamAV 0.95.
-#
-# WITH_OLD_CLAMAV_STREAM=yes
-
-#------------------------------------------------------------------------------
-# By default Exim includes code to support DKIM (DomainKeys Identified
-# Mail, RFC4871) signing and verification.  Verification of signatures is
-# turned on by default.  See the spec for information on conditionally
-# disabling it.  To disable the inclusion of the entire feature, set
-# DISABLE_DKIM to "yes"
-
-# DISABLE_DKIM=yes
-
-
-#------------------------------------------------------------------------------
-# Compiling Exim with experimental features. These are documented in
-# experimental-spec.txt. "Experimental" means that the way these features are
-# implemented may still change. Backward compatibility is not guaranteed.
-
-# Uncomment the following lines to add SPF support. You need to have libspf2
-# installed on your system (www.libspf2.org). Depending on where it is installed
-# you may have to edit the CFLAGS and LDFLAGS lines.
-
-# EXPERIMENTAL_SPF=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lspf2
-
-# Uncomment the following lines to add SRS (Sender rewriting scheme) support.
-# You need to have libsrs_alt installed on your system (srs.mirtol.com).
-# Depending on where it is installed you may have to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_SRS=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lsrs_alt
-
-# Uncomment the following lines to add Brightmail AntiSpam support. You need
-# to have the Brightmail client SDK installed. Please check the experimental
-# documentation for implementation details. You need to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_BRIGHTMAIL=yes
-# CFLAGS  += -I/opt/brightmail/bsdk-6.0/include
-# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
-
-
-
-###############################################################################
-#                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
-###############################################################################
-
-# The items in this section are those that are commonly changed according to
-# the sysadmin's preferences, but whose defaults are often acceptable. The
-# first five are concerned with security issues, where differing levels of
-# paranoia are appropriate in different environments. Sysadmins also vary in
-# their views on appropriate levels of defence in these areas. If you do not
-# understand these issues, go with the defaults, which are used by many sites.
-
-
-#------------------------------------------------------------------------------
-# Although Exim is normally a setuid program, owned by root, it refuses to run
-# local deliveries as root by default. There is a runtime option called
-# "never_users" which lists the users that must never be used for local
-# deliveries. There is also the setting below, which provides a list that
-# cannot be overridden at runtime. This guards against problems caused by
-# unauthorized changes to the runtime configuration. You are advised not to
-# remove "root" from this option, but you can add other users if you want. The
-# list is colon-separated. It must NOT contain any spaces.
-
-# FIXED_NEVER_USERS=root:bin:daemon
-FIXED_NEVER_USERS=root
-
-
-#------------------------------------------------------------------------------
-# By default, Exim insists that its configuration file be owned by root. You
-# can specify one additional permitted owner here.
-
-# CONFIGURE_OWNER=
-
-# If the configuration file is group-writeable, Exim insists by default that it
-# is owned by root. You can specify one additional permitted group owner here.
-
-# CONFIGURE_GROUP=
-
-# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked
-# up at build time, and the uid or gid number is built into the binary.
-# However, you can specify that the lookup is deferred until runtime. In this
-# case, it is the name that is built into the binary. You can do this by a
-# setting of the form:
-
-# CONFIGURE_OWNER=ref:mail
-# CONFIGURE_GROUP=ref:sysadmin
-
-# In other words, put "ref:" in front of the user or group name. Although this
-# costs a bit of resource at runtime, it is convenient to use this feature when
-# building binaries that are to be run on multiple systems where the names may
-# refer to different uids or gids. It also allows you to build Exim on a system
-# where the relevant user or group is not defined.
-
-
-#------------------------------------------------------------------------------
-# The -C option allows Exim to be run with an alternate runtime configuration
-# file. When this is used by root, root privilege is retained by the binary
-# (for any other caller including the Exim user, it is dropped). You can
-# restrict the location of alternate configurations by defining a prefix below.
-# Any file used with -C must then start with this prefix (except that /dev/null
-# is also permitted if the caller is root, because that is used in the install
-# script). If the prefix specifies a directory that is owned by root, a
-# compromise of the Exim account does not permit arbitrary alternate
-# configurations to be used. The prefix can be more restrictive than just a
-# directory (the second example).
-
-# ALT_CONFIG_PREFIX=/some/directory/
-# ALT_CONFIG_PREFIX=/some/directory/exim.conf-
-
-
-#------------------------------------------------------------------------------
-# When a user other than root uses the -C option to override the configuration
-# file (including the Exim user when re-executing Exim to regain root
-# privileges for local message delivery), this will normally cause Exim to
-# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which
-# contains a list of trusted configuration filenames, one per line. If the -C
-# option is used by the Exim user or by the user specified in the
-# CONFIGURE_OWNER setting, to specify a configuration file which is listed in
-# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
-
-# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs
-
-
-#------------------------------------------------------------------------------
-# Uncommenting this option disables the use of the -D command line option,
-# which changes the values of macros in the runtime configuration file.
-# This is another protection against somebody breaking into the Exim account.
-
-# DISABLE_D_OPTION=yes
-
-
-#------------------------------------------------------------------------------
-# By contrast, you might be maintaining a system which relies upon the ability
-# to override values with -D and assumes that these will be passed through to
-# the delivery processes.  As of Exim 4.73, this is no longer the case by
-# default.  Going forward, we strongly recommend that you use a shim Exim
-# configuration file owned by root stored under TRUSTED_CONFIG_LIST.
-# That shim can set macros before .include'ing your main configuration file.
-#
-# As a strictly transient measure to ease migration to 4.73, the
-# WHITELIST_D_MACROS value definies a colon-separated list of macro-names
-# which are permitted to be overridden from the command-line which will be
-# honoured by the Exim user.  So these are macros that can persist to delivery
-# time.
-# Examples might be -DTLS or -DSPOOL=/some/dir.  The values on the
-# command-line are filtered to only permit: [A-Za-z0-9_/.-]*
-#
-# This option is highly likely to be removed in a future release.  It exists
-# only to make 4.73 as easy as possible to migrate to.  If you use it, we
-# encourage you to schedule time to rework your configuration to not depend
-# upon it.  Most people should not need to use this.
-#
-# By default, no macros are whitelisted for -D usage.
-
-# WHITELIST_D_MACROS=TLS:SPOOL
-
-#------------------------------------------------------------------------------
-# Exim has support for the AUTH (authentication) extension of the SMTP
-# protocol, as defined by RFC 2554. If you don't know what SMTP authentication
-# is, you probably won't want to include this code, so you should leave these
-# settings commented out. If you do want to make use of SMTP authentication,
-# you must uncomment at least one of the following, so that appropriate code is
-# included in the Exim binary. You will then need to set up the run time
-# configuration to make use of the mechanism(s) selected.
-
-AUTH_CRAM_MD5=yes
-# AUTH_CYRUS_SASL=yes
-AUTH_DOVECOT=yes
-AUTH_PLAINTEXT=yes
-AUTH_SPA=yes
-
-
-#------------------------------------------------------------------------------
-# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
-# Cyrus SASL library installed before trying to build Exim, and you probably
-# want to uncomment the following line:
-
-# AUTH_LIBS=-lsasl2
-
-
-#------------------------------------------------------------------------------
-# When Exim is decoding MIME "words" in header lines, most commonly for use
-# in the $header_xxx expansion, it converts any foreign character sets to the
-# one that is set in the headers_charset option. The default setting is
-# defined by this setting:
-
-HEADERS_CHARSET="ISO-8859-1"
-
-# If you are going to make use of $header_xxx expansions in your configuration
-# file, or if your users are going to use them in filter files, and the normal
-# character set on your host is something other than ISO-8859-1, you might
-# like to specify a different default here. This value can be overridden in
-# the runtime configuration, and it can also be overridden in individual filter
-# files.
-#
-# IMPORTANT NOTE: The iconv() function is needed for character code
-# conversions. Please see the next item...
-
-
-#------------------------------------------------------------------------------
-# Character code conversions are possible only if the iconv() function is
-# installed on your operating system. There are two places in Exim where this
-# is relevant: (a) The $header_xxx expansion (see the previous item), and (b)
-# the Sieve filter support. For those OS where iconv() is known to be installed
-# as standard, the file in OS/Makefile-xxxx contains
-#
-# HAVE_ICONV=yes
-#
-# If you are not using one of those systems, but have installed iconv(), you
-# need to uncomment that line above. In some cases, you may find that iconv()
-# and its header file are not in the default places. You might need to use
-# something like this:
-#
-# HAVE_ICONV=yes
-# CFLAGS=-O -I/usr/local/include
-# EXTRALIBS_EXIM=-L/usr/local/lib -liconv
-#
-# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-# as well.
-
-
-#------------------------------------------------------------------------------
-# The passwords for user accounts are normally encrypted with the crypt()
-# function. Comparisons with encrypted passwords can be done using Exim's
-# "crypteq" expansion operator. (This is commonly used as part of the
-# configuration of an authenticator for use with SMTP AUTH.) At least one
-# operating system has an extended function called crypt16(), which uses up to
-# 16 characters of a password (the normal crypt() uses only the first 8). Exim
-# supports the use of crypt16() as well as crypt() but note the warning below.
-
-# You can always indicate a crypt16-encrypted password by preceding it with
-# "{crypt16}". If you want the default handling (without any preceding
-# indicator) to use crypt16(), uncomment the following line:
-
-# DEFAULT_CRYPT=crypt16
-
-# If you do that, you can still access the basic crypt() function by preceding
-# an encrypted password with "{crypt}". For more details, see the description
-# of the "crypteq" condition in the manual chapter on string expansions.
-
-# Some operating systems do not include a crypt16() function, so Exim has one
-# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will
-# be set in an OS-specific Makefile for the OS that have such a function, so
-# you should not need to bother with it.
-
-# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
-# It turns out that the above is not entirely accurate. As well as crypt16()
-# there is a function called bigcrypt() that some operating systems have. This
-# may or may not use the same algorithm, and both of them may be different to
-# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined.
-#
-# However, since there is now a move away from the traditional crypt()
-# functions towards using SHA1 and other algorithms, tidying up this area of
-# Exim is seen as very low priority. In practice, if you need to, you can
-# define DEFAULT_CRYPT to the name of any function that has the same interface
-# as the traditional crypt() function.
-# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
-
-
-#------------------------------------------------------------------------------
-# Exim can be built to support the SMTP STARTTLS command, which implements
-# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-# must install the OpenSSL library package or the GnuTLS library. Exim contains
-# no cryptographic code of its own. Uncomment the following lines if you want
-# to build Exim with TLS support. If you don't know what this is all about,
-# leave these settings commented out.
-
-# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-SUPPORT_TLS=yes
-
-# Uncomment this setting if you are using OpenSSL
-TLS_LIBS=-lssl -lcrypto
-
-# Uncomment these settings if you are using GnuTLS
-# USE_GNUTLS=yes
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
-
-# If you are running Exim as a server, note that just building it with TLS
-# support is not all you need to do. You also need to set up a suitable
-# certificate, and tell Exim about it by means of the tls_certificate
-# and tls_privatekey run time options. You also need to set tls_advertise_hosts
-# to specify the hosts to which Exim advertises TLS support. On the other hand,
-# if you are running Exim only as a client, building it with TLS support
-# is all you need to do.
-
-# Additional libraries and include files are required for both OpenSSL and
-# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
-# with all your other libraries. If they are in a special directory, you may
-# need something like
-
-# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
-# or
-# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
-
-# TLS_LIBS is included only on the command for linking Exim itself, not on any
-# auxiliary programs. If the include files are not in a standard place, you can
-# set TLS_INCLUDE to specify where they are, for example:
-
-# TLS_INCLUDE=-I/usr/local/openssl/include/
-# or
-# TLS_INCLUDE=-I/opt/gnu/include
-
-# You don't need to set TLS_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-
-#------------------------------------------------------------------------------
-# The default distribution of Exim contains only the plain text form of the
-# documentation. Other forms are available separately. If you want to install
-# the documentation in "info" format, first fetch the Texinfo documentation
-# sources from the ftp directory and unpack them, which should create files
-# with the extension "texinfo" in the doc directory. You may find that the
-# version number of the texinfo files is different to your Exim version number,
-# because the main documentation isn't updated as often as the code. For
-# example, if you have Exim version 4.43, the source tarball upacks into a
-# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40.
-# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you
-# have unpacked them. Then set INFO_DIRECTORY to the location of your info
-# directory. This varies from system to system, but is often /usr/share/info.
-# Once you have done this, "make install" will build the info files and
-# install them in the directory you have defined.
-
-# INFO_DIRECTORY=/usr/share/info
-
-
-#------------------------------------------------------------------------------
-# Exim log directory and files: Exim creates several log files inside a
-# single log directory. You can define the directory and the form of the
-# log file name here. If you do not set anything, Exim creates a directory
-# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses
-# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change
-# this, you can set LOG_FILE_PATH to a path name containing one occurrence of
-# %s. This will be replaced by one of the strings "main", "panic", or "reject"
-# to form the final file names. Some installations may want something like this:
-
-LOG_FILE_PATH=/var/log/exim/%slog
-
-# which results in files with names /var/log/exim_mainlog, etc. The directory
-# in which the log files are placed must exist; Exim does not try to create
-# it for itself. It is also your responsibility to ensure that Exim is capable
-# of writing files using this path name. The Exim user (see EXIM_USER above)
-# must be able to create and update files in the directory you have specified.
-
-# You can also configure Exim to use syslog, instead of or as well as log
-# files, by settings such as these
-
-# LOG_FILE_PATH=syslog
-# LOG_FILE_PATH=syslog:/var/log/exim_%slog
-
-# The first of these uses only syslog; the second uses syslog and also writes
-# to log files. Do not include white space in such a setting as it messes up
-# the building process.
-
-
-#------------------------------------------------------------------------------
-# When logging to syslog, the following option caters for syslog replacements
-# that are able to accept log entries longer than the 1024 characters allowed
-# by RFC 3164. It is up to you to make sure your syslog daemon can handle this.
-# Non-printable characters are usually unacceptable regardless, so log entries
-# are still split on newline characters.
-
-# SYSLOG_LONG_LINES=yes
-
-# If you are not interested in the process identifier (pid) of the Exim that is
-# making the call to syslog, then comment out the following line.
-
-SYSLOG_LOG_PID=yes
-
-
-#------------------------------------------------------------------------------
-# Cycling log files: this variable specifies the maximum number of old
-# log files that are kept by the exicyclog log-cycling script. You don't have
-# to use exicyclog. If your operating system has other ways of cycling log
-# files, you can use them instead. The exicyclog script isn't run by default;
-# you have to set up a cron job for it if you want it.
-
-EXICYCLOG_MAX=10
-
-
-#------------------------------------------------------------------------------
-# The compress command is used by the exicyclog script to compress old log
-# files. Both the name of the command and the suffix that it adds to files
-# need to be defined here. See also the EXICYCLOG_MAX configuration.
-
-COMPRESS_COMMAND=/bin/gzip
-COMPRESS_SUFFIX=gz
-
-
-#------------------------------------------------------------------------------
-# If the exigrep utility is fed compressed log files, it tries to uncompress
-# them using this command.
-
-ZCAT_COMMAND=/bin/zcat
-
-
-#------------------------------------------------------------------------------
-# Compiling in support for embedded Perl: If you want to be able to
-# use Perl code in Exim's string manipulation language and you have Perl
-# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
-# Perl costs quite a lot of resources. Only do this if you really need it.
-
-# EXIM_PERL=perl.o
-
-
-#------------------------------------------------------------------------------
-# Support for dynamically-loaded string expansion functions via ${dlfunc. If
-# you are using gcc the dynamically-loaded object must be compiled with the
-# -shared option, and you will need to add -export-dynamic to EXTRALIBS so
-# that the local_scan API is made available by the linker. You may also need
-# to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
-
-# EXPAND_DLFUNC=yes
-
-
-#------------------------------------------------------------------------------
-# Exim has support for PAM (Pluggable Authentication Modules), a facility
-# which is available in the latest releases of Solaris and in some GNU/Linux
-# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim
-# support, which is intended for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by the following setting:
-
-SUPPORT_PAM=yes
-
-# You probably need to add -lpam to EXTRALIBS, and in some releases of
-# GNU/Linux -ldl is also needed.
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via Radius is also available. The Exim support,
-# which is intended for use in conjunction with the SMTP AUTH facilities,
-# is included only when requested by setting the following parameter to the
-# location of your Radius configuration file:
-
-# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf
-# RADIUS_CONFIG_FILE=/etc/radius.conf
-
-# If you have set RADIUS_CONFIG_FILE, you should also set one of these to
-# indicate which RADIUS library is used:
-
-# RADIUS_LIB_TYPE=RADIUSCLIENT
-# RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-# RADIUS_LIB_TYPE=RADLIB
-
-# RADIUSCLIENT is the radiusclient library; you probably need to add
-#   -lradiusclient to EXTRALIBS.
-#
-# The API for the radiusclient library was changed at release 0.4.0.
-# Unfortunately, the header file does not define a version number that clients
-# can use to support both the old and new APIs. If you are using version 0.4.0
-# or later of the radiusclient library, you should use RADIUSCLIENTNEW.
-#
-# RADLIB is the Radius library that comes with FreeBSD (the header file is
-#   called radlib.h); you probably need to add -lradius to EXTRALIBS.
-#
-# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library,
-# using the original API.
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via the Cyrus SASL pwcheck daemon is available.
-# Note, however, that pwcheck is now deprecated in favour of saslauthd (see
-# next item). The Exim support for pwcheck, which is intented for use in
-# conjunction with the SMTP AUTH facilities, is included only when requested by
-# setting the following parameter to the location of the pwcheck daemon's
-# socket.
-#
-# There is no need to install all of SASL on your system. You just need to run
-# ./configure --with-pwcheck, cd to the pwcheck directory within the sources,
-# make and make install. You must create the socket directory (default
-# /var/pwcheck) and chown it to exim's user and group. Once you have installed
-# pwcheck, you should arrange for it to be started by root at boot time.
-
-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via the Cyrus SASL saslauthd daemon is available.
-# The Exim support, which is intented for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by setting the following
-# parameter to the location of the saslauthd daemon's socket.
-#
-# There is no need to install all of SASL on your system. You just need to run
-# ./configure --with-saslauthd (and any other options you need, for example, to
-# select or deselect authentication mechanisms), cd to the saslauthd directory
-# within the sources, make and make install. You must create the socket
-# directory (default /var/state/saslauthd) and chown it to exim's user and
-# group. Once you have installed saslauthd, you should arrange for it to be
-# started by root at boot time.
-
-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
-
-
-#------------------------------------------------------------------------------
-# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-# this setting. See the manual section entitled "Use of tcpwrappers" in the
-# chapter on building and installing Exim.
-#
-# USE_TCP_WRAPPERS=yes
-#
-# You may well also have to specify a local "include" file and an additional
-# library for TCP wrappers, so you probably need something like this:
-#
-# USE_TCP_WRAPPERS=yes
-# CFLAGS=-O -I/usr/local/include
-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
-#
-# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-# as well.
-#
-# To use a name other than exim in the tcpwrappers config file,
-# e.g. if you're running multiple daemons with different access lists,
-# or multiple MTAs with the same access list, define
-# TCP_WRAPPERS_DAEMON_NAME accordingly
-#
-# TCP_WRAPPERS_DAEMON_NAME="exim"
-
-
-#------------------------------------------------------------------------------
-# The default action of the exim_install script (which is run by "make
-# install") is to install the Exim binary with a unique name such as
-# exim-4.43-1, and then set up a symbolic link called "exim" to reference it,
-# moving the symbolic link from any previous version. If you define NO_SYMLINK
-# (the value doesn't matter), the symbolic link is not created or moved. You
-# will then have to "turn Exim on" by setting up the link manually.
-
-# NO_SYMLINK=yes
-
-
-#------------------------------------------------------------------------------
-# Another default action of the install script is to install a default runtime
-# configuration file if one does not exist. This configuration has a router for
-# expanding system aliases. The default assumes that these aliases are kept
-# in the traditional file called /etc/aliases. If such a file does not exist,
-# the installation script creates one that contains just comments (no actual
-# aliases). The following setting can be changed to specify a different
-# location for the system alias file.
-
-SYSTEM_ALIASES_FILE=/etc/mail/aliases
-
-
-#------------------------------------------------------------------------------
-# There are some testing options (-be, -bt, -bv) that read data from the
-# standard input when no arguments are supplied. By default, the input lines
-# are read using the standard fgets() function. This does not support line
-# editing during interactive input (though the terminal's "erase" character
-# works as normal). If your operating system has the readline() function, and
-# in addition supports dynamic loading of library functions, you can cause
-# Exim to use readline() for the -be testing option (only) by uncommenting the
-# following setting. Dynamic loading is used so that the library is loaded only
-# when the -be testing option is given; by the time the loading occurs,
-# Exim has given up its root privilege and is running as the calling user. This
-# is the reason why readline() is NOT supported for -bt and -bv, because Exim
-# runs as root or as exim, respectively, for those options. When USE_READLINE
-# is "yes", as well as supporting line editing, a history of input lines in the
-# current run is maintained.
-
-# USE_READLINE=yes
-
-# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
-# Note that this option adds to the size of the Exim binary, because the
-# dynamic loading library is not otherwise included.
-
-
-
-###############################################################################
-#              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
-###############################################################################
-
-# The settings in this section are available for use in special circumstances.
-# In the vast majority of installations you need not change anything below.
-
-
-#------------------------------------------------------------------------------
-# The following commands live in different places in some OS. Either the
-# ultimate default settings, or the OS-specific files should already point to
-# the right place, but they can be overridden here if necessary. These settings
-# are used when building various scripts to ensure that the correct paths are
-# used when the scripts are run. They are not used in the Makefile itself. Perl
-# is not necessary for running Exim unless you set EXIM_PERL (see above) to get
-# it embedded, but there are some utilities that are Perl scripts. If you
-# haven't got Perl, Exim will still build and run; you just won't be able to
-# use those utilities.
-
-# CHOWN_COMMAND=/usr/bin/chown
-# CHGRP_COMMAND=/usr/bin/chgrp
-# CHMOD_COMMAND=/usr/bin/chmod
-# MV_COMMAND=/bin/mv
-# RM_COMMAND=/bin/rm
-# TOUCH_COMMAND=/usr/bin/touch
-# PERL_COMMAND=/usr/bin/perl
-
-
-#------------------------------------------------------------------------------
-# The following macro can be used to change the command for building a library
-# of functions. By default the "ar" command is used, with options "cq".
-# Only in rare circumstances should you need to change this.
-
-# AR=ar cq
-
-
-#------------------------------------------------------------------------------
-# In some operating systems, the value of the TMPDIR environment variable
-# controls where temporary files are created. Exim does not make use of
-# temporary files, except when delivering to MBX mailboxes. However, if Exim
-# calls any external libraries (e.g. DBM libraries), they may use temporary
-# files, and thus be influenced by the value of TMPDIR. For this reason, when
-# Exim starts, it checks the environment for TMPDIR, and if it finds it is set,
-# it replaces the value with what is defined here. Commenting this setting
-# suppresses the check altogether.
-
-TMPDIR="/tmp"
-
-
-#------------------------------------------------------------------------------
-# The following macros can be used to change the default modes that are used
-# by the appendfile transport. In most installations the defaults are just
-# fine, and in any case, you can change particular instances of the transport
-# at run time if you want.
-
-# APPENDFILE_MODE=0600
-# APPENDFILE_DIRECTORY_MODE=0700
-# APPENDFILE_LOCKFILE_MODE=0600
-
-
-#------------------------------------------------------------------------------
-# In some installations there may be multiple machines sharing file systems,
-# where a different configuration file is required for Exim on the different
-# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look
-# for a configuration file whose name is that defined by CONFIGURE_FILE,
-# with the node name obtained by uname() tacked on the end, separated by a
-# period (for example, /usr/exim/configure.host.in.some.domain). If this file
-# does not exist, then the bare configuration file name is tried.
-
-# CONFIGURE_FILE_USE_NODE=yes
-
-
-#------------------------------------------------------------------------------
-# In some esoteric configurations two different versions of Exim are run,
-# with different setuid values, and different configuration files are required
-# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then
-# Exim will first look for a configuration file whose name is that defined
-# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by
-# a period (for eximple, /usr/exim/configure.0). If this file does not exist,
-# then the bare configuration file name is tried. In the case when both
-# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files
-# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>.
-
-# CONFIGURE_FILE_USE_EUID=yes
-
-
-#------------------------------------------------------------------------------
-# The size of the delivery buffers: These specify the sizes (in bytes) of
-# the buffers that are used when copying a message from the spool to a
-# destination. There is rarely any need to change these values.
-
-# DELIVER_IN_BUFFER_SIZE=8192
-# DELIVER_OUT_BUFFER_SIZE=8192
-
-
-#------------------------------------------------------------------------------
-# The mode of the database directory: Exim creates a directory called "db"
-# in its spool directory, to hold its databases of hints. This variable
-# determines the mode of the created directory. The default value in the
-# source is 0750.
-
-# EXIMDB_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# Database file mode: The mode of files created in the "db" directory defaults
-# to 0640 in the source, and can be changed here.
-
-# EXIMDB_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# Database lock file mode: The mode of zero-length files created in the "db"
-# directory to use for locking purposes defaults to 0640 in the source, and
-# can be changed here.
-
-# EXIMDB_LOCKFILE_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# This parameter sets the maximum length of the header portion of a message
-# that Exim is prepared to process. The default setting is one megabyte. The
-# limit exists in order to catch rogue mailers that might connect to your SMTP
-# port, start off a header line, and then just pump junk at it for ever. The
-# message_size_limit option would also catch this, but it may not be set.
-# The value set here is the default; it can be changed at runtime.
-
-# HEADER_MAXSIZE="(1024*1024)"
-
-
-#------------------------------------------------------------------------------
-# The mode of the input directory: The input directory is where messages are
-# kept while awaiting delivery. Exim creates it if necessary, using a mode
-# which can be defined here (default 0750).
-
-# INPUT_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The mode of Exim's log directory, when it is created by Exim inside the spool
-# directory, defaults to 0750 but can be changed here.
-
-# LOG_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The log files themselves are created as required, with a mode that defaults
-# to 0640, but which can be changed here.
-
-# LOG_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# The TESTDB lookup is for performing tests on the handling of lookup results,
-# and is not useful for general running. It should be included only when
-# debugging the code of Exim.
-
-# LOOKUP_TESTDB=yes
-
-
-#------------------------------------------------------------------------------
-# /bin/sh is used by default as the shell in which to run commands that are
-# defined in the makefiles. This can be changed if necessary, by uncommenting
-# this line and specifying another shell, but note that a Bourne-compatible
-# shell is expected.
-
-# MAKE_SHELL=/bin/sh
-
-
-#------------------------------------------------------------------------------
-# The maximum number of named lists of each type (address, domain, host, and
-# local part) can be increased by changing this value. It should be set to
-# a multiple of 16.
-
-MAX_NAMED_LIST=16
-
-
-#------------------------------------------------------------------------------
-# Network interfaces: Unless you set the local_interfaces option in the runtime
-# configuration file to restrict Exim to certain interfaces only, it will run
-# code to find all the interfaces there are on your host. Unfortunately,
-# the call to the OS that does this requires a buffer large enough to hold
-# data for all the interfaces - it was designed in the days when a host rarely
-# had more than three or four interfaces. Nowadays hosts can have very many
-# virtual interfaces running on the same hardware. If you have more than 250
-# virtual interfaces, you will need to uncomment this setting and increase the
-# value.
-
-# MAXINTERFACES=250
-
-
-#------------------------------------------------------------------------------
-# Per-message logs: While a message is in the process of being delivered,
-# comments on its progress are written to a message log, for the benefit of
-# human administrators. These logs are held in a directory called "msglog"
-# in the spool directory. Its mode defaults to 0750, but can be changed here.
-# The message log directory is also used for storing files that are used by
-# transports for returning data to a message's sender (see the "return_output"
-# option for transports).
-
-# MSGLOG_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# There are three options which are used when compiling the Perl interface and
-# when linking with Perl. The default values for these are placed automatically
-# at the head of the Makefile by the script which builds it. However, if you
-# want to override them, you can do so here.
-
-# PERL_CC=
-# PERL_CCOPTS=
-# PERL_LIBS=
-
-
-#------------------------------------------------------------------------------
-# Identifying the daemon: When an Exim daemon starts up, it writes its pid
-# (process id) to a file so that it can easily be identified. The path of the
-# file can be specified here. Some installations may want something like this:
-
-PID_FILE_PATH=/var/run/exim.pid
-
-# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
-# using the name "exim-daemon.pid".
-
-# If you start up a daemon without the -bd option (for example, with just
-# the -q15m option), a pid file is not written. Also, if you override the
-# configuration file with the -oX option, no pid file is written. In other
-# words, the pid file is written only for a "standard" daemon.
-
-
-#------------------------------------------------------------------------------
-# If Exim creates the spool directory, it is given this mode, defaulting in the
-# source to 0750.
-
-# SPOOL_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The mode of files on the input spool which hold the contents of messages can
-# be changed here. The default is 0640 so that information from the spool is
-# available to anyone who is a member of the Exim group.
-
-# SPOOL_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# Moving frozen messages: If the following is uncommented, Exim is compiled
-# with support for automatically moving frozen messages out of the main spool
-# directory, a facility that is found useful by some large installations. A
-# run time option is required to cause the moving actually to occur. Such
-# messages become "invisible" to the normal management tools.
-
-# SUPPORT_MOVE_FROZEN_MESSAGES=yes
-
-
-#------------------------------------------------------------------------------
-# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you
-# really, really, really know what you are doing. And even then, think again.
-# You should never uncomment this when compiling a binary for distribution.
-# Use it only when compiling Exim for your own use.
-#
-# Uncommenting this line enables the use of a runtime option called
-# disable_fsync, which can be used to stop Exim using fsync() to ensure that
-# files are written to disc before proceeding. When this is disabled, crashes
-# and hardware problems such as power outages can cause data to be lost. This
-# feature should only be used in very exceptional circumstances. YOU HAVE BEEN
-# WARNED.
-
-# ENABLE_DISABLE_FSYNC=yes
-
-HAVE_IPV6=YES
-LOOKUP_LIBS=-lldap -llber
-EXTRALIBS_EXIM=-lpam
-# End of EDITME for Exim 4.
diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d
deleted file mode 100644
index b9bec4335..000000000
--- a/community-testing/exim/exim.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-EXIM_ARGS="-bd -q15m"
diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install
deleted file mode 100644
index 8ed329559..000000000
--- a/community-testing/exim/exim.install
+++ /dev/null
@@ -1,25 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
-  if getent passwd exim > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim 
-  fi
-  passwd -l exim > /dev/null
-  chown root.exim /var/spool/exim /var/log/exim
-  chown exim.exim /var/spool/exim/db
-  chmod u+s /usr/sbin/exim
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  getent passwd exim >/dev/null 2>&1 && userdel exim
-}
-
diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate
deleted file mode 100644
index 070ba4747..000000000
--- a/community-testing/exim/exim.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/exim/*log {
-   su exim exim
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/community-testing/expac/PKGBUILD b/community-testing/expac/PKGBUILD
deleted file mode 100644
index ff83247d7..000000000
--- a/community-testing/expac/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 56821 2011-10-13 19:47:47Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
-
-pkgname=expac
-pkgver=0.07
-pkgrel=1
-pkgdesc="pacman database extraction utility"
-arch=('i686' 'x86_64')
-url="http://github.com/falconindy/expac"
-license=('GPL')
-depends=('pacman')
-makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('1bc637b733051827982db12db84643f2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-}
-
-# vim: ft=sh syn=sh
diff --git a/community-testing/fcron/PKGBUILD b/community-testing/fcron/PKGBUILD
deleted file mode 100644
index 2efb43d1e..000000000
--- a/community-testing/fcron/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 61839 2012-01-08 19:56:09Z ttopper $
-# Contributor: Giorgio Lando <lando at imap dot cc>
-# Contributor: Sergej Pupykin
-# Contributor: Thomas Bächler
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-
-pkgname=fcron
-pkgver=3.0.6
-pkgrel=5
-pkgdesc="feature-rich cron implementation"
-arch=(i686 x86_64)
-url="http://fcron.free.fr"
-license=('GPL')
-depends=('pam')
-makedepends=('smtp-server')
-optdepends=('smtp-server: to receive mails from cron jobs')
-provides=('cron')
-conflicts=('dcron')
-backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
-        var/spool/fcron/systab var/spool/fcron/systab.orig)
-options=('emptydirs' '!makeflags')
-source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
-        systab systab.orig run-cron)
-md5sums=('69ebcb41921e2a282f41ebecb3a27053'
-         'e0c3f0bdc3c98fbbe46eff19001c18f2'
-         '938722c6654ef7b07f4aa10001905ba1'
-         'bfb7daa22ebe22b9917e455c1ca4a382'
-         '5ff0cdcb9ec99778938ac6ef26800327')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/fcron \
-              --with-answer-all=no \
-              --with-boot-install=no \
-              --with-username=root \
-              --with-groupname=root \
-              --datarootdir=/usr/share \
-	            --datadir=/usr/share \
-              --with-docdir=/usr/share/doc \
-              --localstatedir=/var \
-	            --with-editor=/usr/bin/vi \
-              --with-sendmail=/usr/sbin/sendmail
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  make DESTDIR="$pkgdir/" install
-  install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron"
-  install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
-  
-  install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
-  # Install default fcrontab so that fcron can completely replace dcron
-  
-  install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
-  # In order to preserve the systab crontab in any case it is better to have
-  # it in non-binary form too
-  install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
-
-  # Add cron.* directories
-  install -d -m755 "$pkgdir/etc/cron.daily"
-  install -d -m755 "$pkgdir/etc/cron.hourly"
-  install -d -m755 "$pkgdir/etc/cron.monthly"
-  install -d -m755 "$pkgdir/etc/cron.weekly"
-  
-  # Install run-cron script to make fcron run without dcron
-  install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/fcron/fcron.rc b/community-testing/fcron/fcron.rc
deleted file mode 100644
index 880439a1d..000000000
--- a/community-testing/fcron/fcron.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/fcron`
-case "$1" in
-  start)
-    stat_busy "Starting Fcron Daemon"
-    [ -z "$PID" ] && /usr/sbin/fcron -b
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fcron
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Fcron Daemon"
-    [ -n "$PID" ]  && kill $PID >/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fcron
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/fcron/run-cron b/community-testing/fcron/run-cron
deleted file mode 100644
index 51007a15a..000000000
--- a/community-testing/fcron/run-cron
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-
-if [ -z $1 ]; then
-   echo "Usage: $0 crondir"
-   exit 1
-fi
-
-for cron in $1/* ; do
-  if [ -x $cron ]; then
-     $cron
-  fi
-done
-unset cron
diff --git a/community-testing/fcron/systab b/community-testing/fcron/systab
deleted file mode 100644
index 11c7e2fd0..000000000
--- a/community-testing/fcron/systab
+++ /dev/null
diff --git a/community-testing/fcron/systab.orig b/community-testing/fcron/systab.orig
deleted file mode 100644
index 5b0045626..000000000
--- a/community-testing/fcron/systab.orig
+++ /dev/null
@@ -1,4 +0,0 @@
-&bootrun 01 * * * *  /usr/sbin/run-cron /etc/cron.hourly
-&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily
-&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly
-&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly
diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD
deleted file mode 100644
index 1ba275a25..000000000
--- a/community-testing/gogglesmm/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61833 2012-01-08 19:51:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=gogglesmm
-pkgver=0.12.6
-pkgrel=1
-pkgdesc="Music Manager and Player"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/gogglesmm/"
-license=('GPL3')
-install=gogglesmm.install
-depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt')
-makedepends=('pkgconfig' 'glproto' 'dri2proto')
-replaces=('musicmanager')
-conflicts=('musicmanager')
-source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2)
-md5sums=('19505ee514690fe3372621685666db4c')
-
-build() {
-  cd $srcdir/gogglesmm-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/gogglesmm-$pkgver
-  mkdir -p $pkgdir/usr/bin
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install
deleted file mode 100644
index 04c026840..000000000
--- a/community-testing/gogglesmm/gogglesmm.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/libgda3/PKGBUILD b/community-testing/libgda3/PKGBUILD
deleted file mode 100644
index 8505681d0..000000000
--- a/community-testing/libgda3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 61876 2012-01-09 18:49:52Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libgda3
-pkgver=3.1.5
-pkgrel=11
-pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
-arch=('i686' 'x86_64')
-url="http://www.gnome-db.org/Download"
-license=('GPL')
-depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs'
-         'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng')
-options=('!libtool' '!distcc')
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2)
-md5sums=('eb7da5286a112e7cff3111c89fba4456')
-
-build() {
-  cd "$srcdir/libgda-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package(){
-  cd "$srcdir/libgda-$pkgver"
-  make DESTDIR=$pkgdir install
-  cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \;
-}
diff --git a/community-testing/librcc/PKGBUILD b/community-testing/librcc/PKGBUILD
deleted file mode 100644
index 121323dd8..000000000
--- a/community-testing/librcc/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 61878 2012-01-09 18:50:01Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=librcc
-pkgver=0.2.6
-pkgrel=5
-pkgdesc="Charset Conversion Library"
-arch=(i686 x86_64)
-url="http://rusxmms.sourceforge.net/"
-license=('GPL')
-depends=(aspell enca libxml2 db librcd)
-makedepends=(patch gtk gtk2)
-install=librcc.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2
-        librcc-strnlen.patch)
-md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1'
-         '040313d1d8f166ccf2b128cea4c05f21')
-
-build() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  ./configure --prefix=/usr
-  patch -p1 <$srcdir/librcc-strnlen.patch
-  make
-}
-
-package() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  mkdir -p $startdir/pkg/etc/rcc
-  mkdir -p $startdir/pkg/usr/lib/rcc/engines
-  mkdir -p $startdir/pkg/usr/bin
-
-  make DESTDIR=$startdir/pkg install
-
-  make -C examples
-  make -C examples install DESTDIR=$startdir/pkg
-  rm -f $startdir/pkg/usr/bin/example*
-
-  install -m 644 examples/rcc.xml $startdir/pkg/etc
-
-  if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then
-      ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config
-  elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then
-      ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config
-  else
-      echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config
-      echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config
-  fi
-}
diff --git a/community-testing/librcc/librcc-strnlen.patch b/community-testing/librcc/librcc-strnlen.patch
deleted file mode 100644
index 9fc0e8b0b..000000000
--- a/community-testing/librcc/librcc-strnlen.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h
---- librcc-0.2.6/src/rccstring.h	2006-01-08 15:42:59.000000000 +0000
-+++ librcc-0.2.6.qwe/src/rccstring.h	2009-09-28 08:45:37.000000000 +0000
-@@ -18,13 +18,6 @@
- int rccStringFixID(rcc_string string, rcc_context ctx);
- int rccStringChangeID(rcc_string string, rcc_language_id language_id);
- 
--#ifdef HAVE_STRNLEN
--# ifndef strnlen
--int strnlen(const char *str, size_t size);
--# endif /* !strnlen */
--#else
--int rccStrnlen(const char *str, size_t size);
--#endif /* HAVE_STRNLEN */
- int rccIsASCII(const char *str);
- size_t rccStringSizedGetChars(const char *str, size_t size);
- 
diff --git a/community-testing/librcc/librcc.install b/community-testing/librcc/librcc.install
deleted file mode 100644
index 53b1d7ce7..000000000
--- a/community-testing/librcc/librcc.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc"
-  echo "   gui features"
-  echo "-- Also you may change /usr/bin/rcc-config symlink to switch between"
-  echo "   gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)"
-}
diff --git a/community-testing/libzdb/PKGBUILD b/community-testing/libzdb/PKGBUILD
deleted file mode 100644
index 9e03c87cf..000000000
--- a/community-testing/libzdb/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 62082 2012-01-15 19:15:26Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libzdb
-pkgver=2.10
-pkgrel=1
-pkgdesc="Zild Database Library"
-arch=(i686 x86_64)
-url="http://www.tildeslash.com/libzdb/"
-license=('GPL')
-depends=('postgresql-libs' 'sqlite3' 'libmysqlclient')
-options=(!libtool)
-source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz)
-md5sums=('fdc04b4b7f33cdcdfc6b559ba9965825')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/lilypond/PKGBUILD b/community-testing/lilypond/PKGBUILD
deleted file mode 100644
index 5742b97cd..000000000
--- a/community-testing/lilypond/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62073 2012-01-15 17:13:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
-
-pkgname=lilypond
-pkgver=2.14.2
-pkgrel=4
-pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
-url="http://lilypond.org"
-license=('GPL')
-depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
-	     'gsfonts' 'texi2html')
-options=('emptydirs')
-install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz
-	texlive-workaround.patch)
-md5sums=('4053a19e03181021893981280feb9aaa'
-         'ff32863f3eed67ac744e50bc4fc67a87')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # 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 python/out/
-  patch -p1 <$srcdir/texlive-workaround.patch
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/lilypond/lilypond.install b/community-testing/lilypond/lilypond.install
deleted file mode 100644
index 934e7b435..000000000
--- a/community-testing/lilypond/lilypond.install
+++ /dev/null
@@ -1,48 +0,0 @@
-infodir=usr/share/info
-filelist=(music-glossary.info
-	lilypond-web.info
-	lilypond-contributor.info
-	lilypond-contributor.info-1
-	lilypond-contributor.info-2
-	lilypond-internals.info-1
-	lilypond-internals.info-2
-	lilypond-internals.info-3
-	lilypond-internals.info-4
-	lilypond-internals.info-5
-	lilypond-notation.info-1
-	lilypond-notation.info-2
-	lilypond-notation.info-3
-	lilypond-notation.info-4
-	lilypond-notation.info-5
-	lilypond-notation.info-6
-	lilypond-usage.info
-	lilypond-learning.info
-	lilypond-web.info-1
-	lilypond-web.info-2
-	lilypond-internals.info
-	lilypond-essay.info
-	lilypond-notation.info
-	lilypond-learning.info-1
-	lilypond-learning.info-2
-	lilypond-extending.info
-	lilypond-changes.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/lilypond/texlive-workaround.patch b/community-testing/lilypond/texlive-workaround.patch
deleted file mode 100644
index 1eb262863..000000000
--- a/community-testing/lilypond/texlive-workaround.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
-index d5cbb7f..b25c4bc 100644
---- a/mf/feta-autometric.mf
-+++ b/mf/feta-autometric.mf
-@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- 			& to_bp (w) & " "
- 			& to_bp (h);
- 		special "% MF2PT1: font_size " & decimal designsize;
--		special "% MF2PT1: font_slant " & decimal font_slant_;
- 
- 		for fvar = "font_identifier",
- 			   "font_coding_scheme",
-@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- 			fi;
- 		endfor;
- 
--		special "% MF2PT1: font_fixed_pitch "
--			& (if font_fixed_pitch_: "1" else: "0" fi);
--
- 		% this must come after the `font_size' special
- 		special "% MF2PT1: charwd " & decimal charwd;
- 	fi;
-diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp
-index a8b45aa..c935628 100644
---- a/mf/mf2pt1.mp
-+++ b/mf/mf2pt1.mp
-@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
-     def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef;
-     special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h);
-     special "% MF2PT1: font_size " & decimal designsize;
--    special "% MF2PT1: font_slant " & decimal font_slant_;
-     special "% MF2PT1: charwd " & decimal charwd;   % Must come after the |font_size| |special|
-     for fvar = "font_identifier", "font_coding_scheme", "font_version",
-       "font_comment", "font_family", "font_weight", "font_unique_id",
-@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
-           scantokens ("decimal " & fvar & "_");
-       fi;
-     endfor;
--    special "% MF2PT1: font_fixed_pitch " &
--            (if font_fixed_pitch_: "1" else: "0" fi);
- enddef;
- 
- 
-@@ -91,19 +88,6 @@ enddef;
- 
- 
- %% \begin{explaincode}
--%%   Store the value of \mfcomment
--%    |font_slant_|, so we can recall it at each |beginchar|.
--%% \end{explaincode}
--
--font_slant_ := 0;
--
--def font_slant expr x =
--  font_slant_ := x;
--  fontdimen 1: x
--enddef;
--
--
--%% \begin{explaincode}
- %%   Redefine \mfcomment
- %    |bpppix_|, the number of ``big'' points per pixel. \mfcomment
- %    This in turn redefines |mm|, |in|, |pt|, and other derived units.
-@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness:
-   scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;");
- endfor;
- 
--boolean font_fixed_pitch_;
--font_fixed_pitch_ := false;
--def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef;
--
--
- %% \begin{explaincode}
- %%   We'd like to be able to use calligraphic pens.  Normally, MetaPost's
- %%   output routine does all the work for us of converting these to filled
-diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
-index 95df0f8..20f410b 100644
---- a/scripts/build/mf2pt1.pl
-+++ b/scripts/build/mf2pt1.pl
-@@ -427,7 +427,7 @@ ENDHEADER
- sub get_bboxes ($)
- {
-     execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
--                        "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
-+                        "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile");
-     opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
-     @charfiles = sort
-                    { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] }
diff --git a/community-testing/me-tv/PKGBUILD b/community-testing/me-tv/PKGBUILD
deleted file mode 100644
index 4a97fb410..000000000
--- a/community-testing/me-tv/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-#Maintainer: jakob gruber <jakob.gruber@gmail.com>
-#Contributor: gborzi
-#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us>
-#Previous Contributor: Heiko Baums <heiko@baums-on-web.de>
-#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
-
-pkgname=me-tv
-pkgver=2.0.1
-pkgrel=3
-pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/me-tv"
-license=('GPL')
-depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base')
-makedepends=('intltool')
-install='me-tv.install'
-source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-options=('!emptydirs')
-md5sums=('7cda820b795f2fea522ba3de5e312483')
-
-build() {
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr
-	make
-
-}
-
-package() {
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-	install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-	gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
-        --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas"
-
-	rm -rf "${pkgdir}/usr/etc/"
-
-}
diff --git a/community-testing/me-tv/me-tv.install b/community-testing/me-tv/me-tv.install
deleted file mode 100644
index f701b4754..000000000
--- a/community-testing/me-tv/me-tv.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=me-tv
-
-post_install() {
-	usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/community-testing/packagekit/PKGBUILD b/community-testing/packagekit/PKGBUILD
deleted file mode 100644
index a4b82edcd..000000000
--- a/community-testing/packagekit/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 61812 2012-01-08 10:29:29Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-pkgbase='packagekit'
-pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.19
-pkgrel=5
-pkgdesc="A system designed to make installation and updates of packages easier."
-arch=('i686' 'x86_64')
-url="http://www.packagekit.org"
-license=('GPL')
-makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
-             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
-	     'shared-mime-info' 'sqlite3' 'udev')
-options=('!libtool')
-source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
-        'alpm.patch')
-sha256sums=('961c6408de08ebaf15c09e74afd06918d699be8974b5c35c2c9663e5b12b5223'
-            '5ae3330f28d98c2369fad2a1fb6f8c1edd95c096b8fb4f1b170de6e8b2b134d8')
-
-build() {
-  cd "$srcdir/PackageKit-$pkgver"
-
-  patch -Np1 -i "$srcdir/alpm.patch"
-
-  # TODO: remove when this is fixed upstream
-  find -name '*.moc' -print0 | xargs -0 rm
-
-  sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in'
-  sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in'
-  sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
-
-  export PYTHON=/usr/bin/python2
-  # TODO: remove when upstream is patched
-  autoreconf
-  ./configure --prefix=/usr \
-	      --sysconfdir=/etc \
-	      --localstatedir=/var \
-	      --libexecdir=/usr/lib/PackageKit \
-	      --disable-static \
-	      --disable-gtk-doc \
-	      --disable-tests \
-	      --disable-local \
-	      --disable-browser-plugin \
-	      --disable-gstreamer-plugin \
-	      --disable-gtk-module \
-	      --disable-command-not-found \
-	      --disable-cron \
-	      --disable-debuginfo-install \
-	      --enable-pm-utils \
-	      --disable-dummy \
-	      --enable-alpm \
-	      --with-default-backend=alpm
-  make -s
-}
-
-package_packagekit() {
-  backup=('var/lib/PackageKit/transactions.db'
-          'etc/PackageKit/alpm.d/pacman.conf'
-          'etc/PackageKit/alpm.d/repos.list')
-  depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
-           'shared-mime-info' 'sqlite3' 'udev')
-  optdepends=('networkmanager')
-  install='packagekit.install'
-
-  cd "$srcdir/PackageKit-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir/usr/include/PackageKit/packagekit-qt"*
-  rm -rf "$pkgdir/usr/lib/libpackagekit-qt"*
-  rm -rf "$pkgdir/usr/lib/pkgconfig/packagekit-qt"*
-  rm -rf "$pkgdir/usr/share/cmake"
-
-  rm -rf "$pkgdir/usr/lib/python"*
-  rm -rf "$pkgdir/usr/share/PackageKit/website"
-
-  mv "$pkgdir/etc/bash_completion.d/pk-completion.bash" \
-     "$pkgdir/etc/bash_completion.d/pkcon"
-  touch "$pkgdir/var/log/PackageKit"
-}
-
-package_packagekit-qt() {
-  depends=('packagekit' 'qt')
-  pkgdesc=('Qt bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt"
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_packagekit-qt2() {
-  depends=('packagekit' 'qt')
-  pkgdesc=('Qt bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2"
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_packagekit-python() {
-  depends=('packagekit' 'python2')
-  pkgdesc=('Python bindings for PackageKit')
-
-  cd "$srcdir/PackageKit-$pkgver/lib/python"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/packagekit/alpm.patch b/community-testing/packagekit/alpm.patch
deleted file mode 100644
index a6a6fcc0a..000000000
--- a/community-testing/packagekit/alpm.patch
+++ /dev/null
@@ -1,2991 +0,0 @@
-diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am
-index 5a5468a..d8c3dfc 100644
---- a/backends/alpm/Makefile.am
-+++ b/backends/alpm/Makefile.am
-@@ -5,6 +5,7 @@ PK_BACKEND_REPO_FILE = $(confdir)/repos.list
- PK_BACKEND_DEFAULT_PATH = "/bin:/usr/bin:/sbin:/usr/sbin"
- PK_BACKEND_DEFAULT_ROOT = "/"
- PK_BACKEND_DEFAULT_DBPATH = $(localstatedir)/lib/pacman/
-+PK_BACKEND_DEFAULT_GPGDIR = $(sysconfdir)/pacman.d/gnupg/
- PK_BACKEND_DEFAULT_CACHEDIR = $(localstatedir)/cache/pacman/pkg/
- PK_BACKEND_DEFAULT_LOGFILE = $(localstatedir)/log/pacman.log
- 
-@@ -17,6 +18,7 @@ DEFS = -DPK_BACKEND_CONFIG_FILE=\"$(PK_BACKEND_CONFIG_FILE)\" \
-        -DPK_BACKEND_DEFAULT_PATH=\"$(PK_BACKEND_DEFAULT_PATH)\" \
-        -DPK_BACKEND_DEFAULT_ROOT=\"$(PK_BACKEND_DEFAULT_ROOT)\" \
-        -DPK_BACKEND_DEFAULT_DBPATH=\"$(PK_BACKEND_DEFAULT_DBPATH)\" \
-+       -DPK_BACKEND_DEFAULT_GPGDIR=\"$(PK_BACKEND_DEFAULT_GPGDIR)\" \
-        -DPK_BACKEND_DEFAULT_CACHEDIR=\"$(PK_BACKEND_DEFAULT_CACHEDIR)\" \
-        -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \
-        -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \
-diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
-index ba993f0..417714c 100644
---- a/backends/alpm/pk-backend-alpm.c
-+++ b/backends/alpm/pk-backend-alpm.c
-@@ -26,6 +26,7 @@
- #include <sys/utsname.h>
- 
- #include "pk-backend-alpm.h"
-+#include "pk-backend-config.h"
- #include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- #include "pk-backend-groups.h"
-@@ -35,7 +36,8 @@ PkBackend *backend = NULL;
- GCancellable *cancellable = NULL;
- static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
- 
--pmdb_t *localdb = NULL;
-+alpm_handle_t *alpm = NULL;
-+alpm_db_t *localdb = NULL;
- 
- gchar *xfercmd = NULL;
- alpm_list_t *holdpkgs = NULL;
-@@ -162,7 +164,7 @@ out:
- }
- 
- static void
--pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args)
-+pk_backend_logcb (alpm_loglevel_t level, const gchar *format, va_list args)
- {
- 	gchar *output;
- 
-@@ -176,12 +178,12 @@ pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args)
- 
- 	/* report important output to PackageKit */
- 	switch (level) {
--		case PM_LOG_DEBUG:
--		case PM_LOG_FUNCTION:
-+		case ALPM_LOG_DEBUG:
-+		case ALPM_LOG_FUNCTION:
- 			g_debug ("%s", output);
- 			break;
- 
--		case PM_LOG_WARNING:
-+		case ALPM_LOG_WARNING:
- 			g_warning ("%s", output);
- 			pk_backend_output (backend, output);
- 			break;
-@@ -212,26 +214,21 @@ pk_backend_initialize_alpm (PkBackend *self, GError **error)
- 	g_setenv ("HTTP_USER_AGENT", user_agent, FALSE);
- 	g_free (user_agent);
- 
--	g_debug ("initializing");
--	if (alpm_initialize () < 0) {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+	alpm = pk_backend_configure (PK_BACKEND_CONFIG_FILE, error);
-+	if (alpm == NULL) {
- 		return FALSE;
- 	}
- 
- 	backend = self;
--	localdb = alpm_option_get_localdb ();
-+	alpm_option_set_logcb (alpm, pk_backend_logcb);
-+
-+	localdb = alpm_option_get_localdb (alpm);
- 	if (localdb == NULL) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", "local",
--			     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", "local",
-+			     alpm_strerror (errno));
- 	}
- 
--	/* set some sane defaults */
--	alpm_option_set_logcb (pk_backend_logcb);
--	alpm_option_set_root (PK_BACKEND_DEFAULT_ROOT);
--	alpm_option_set_dbpath (PK_BACKEND_DEFAULT_DBPATH);
--	alpm_option_set_logfile (PK_BACKEND_DEFAULT_LOGFILE);
--
- 	return TRUE;
- }
- 
-@@ -240,17 +237,20 @@ pk_backend_destroy_alpm (PkBackend *self)
- {
- 	g_return_if_fail (self != NULL);
- 
--	if (backend != NULL) {
--		if (alpm_trans_get_flags () != -1) {
--			alpm_trans_release ();
-+	if (alpm != NULL) {
-+		if (alpm_trans_get_flags (alpm) < 0) {
-+			alpm_trans_release (alpm);
- 		}
--		alpm_release ();
-+		alpm_release (alpm);
-+
-+		alpm = NULL;
- 		backend = NULL;
- 	}
- 
- 	FREELIST (syncfirsts);
- 	FREELIST (holdpkgs);
- 	g_free (xfercmd);
-+	xfercmd = NULL;
- }
- 
- void
-diff --git a/backends/alpm/pk-backend-alpm.h b/backends/alpm/pk-backend-alpm.h
-index 23a2724..ecd6d0f 100644
---- a/backends/alpm/pk-backend-alpm.h
-+++ b/backends/alpm/pk-backend-alpm.h
-@@ -28,7 +28,8 @@
- extern PkBackend *backend;
- extern GCancellable *cancellable;
- 
--extern pmdb_t *localdb;
-+extern alpm_handle_t *alpm;
-+extern alpm_db_t *localdb;
- 
- extern gchar *xfercmd;
- extern alpm_list_t *holdpkgs;
-diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c
-index 21a4c54..a51a984 100644
---- a/backends/alpm/pk-backend-config.c
-+++ b/backends/alpm/pk-backend-config.c
-@@ -28,29 +28,44 @@
- 
- #include "pk-backend-alpm.h"
- #include "pk-backend-config.h"
-+#include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- 
--typedef struct {
--	gboolean checkspace, ilovecandy, showsize, totaldl, usedelta, usesyslog;
-+typedef struct
-+{
-+	 gboolean	 checkspace, ilovecandy, totaldl, usedelta, usesyslog,
-+			 verbosepkglists;
- 
--	gchar *arch, *cleanmethod, *dbpath, *logfile, *root, *xfercmd;
-+	 gchar		*arch, *cleanmethod, *dbpath, *gpgdir, *logfile, *root,
-+			*xfercmd;
- 
--	alpm_list_t *cachedirs, *holdpkgs, *ignoregrps, *ignorepkgs,
--		    *noextracts, *noupgrades, *syncfirsts;
-+	 alpm_list_t	*cachedirs, *holdpkgs, *ignoregroups, *ignorepkgs,
-+			*noextracts, *noupgrades, *syncfirsts;
- 
--	alpm_list_t *repos;
--	GHashTable *servers;
--	GRegex *xrepo, *xarch;
-+	 alpm_list_t	*repos;
-+	 GHashTable	*servers;
-+	 GHashTable	*levels;
-+	 GRegex		*xrepo, *xarch;
- } PkBackendConfig;
- 
- static PkBackendConfig *
- pk_backend_config_new (void)
- {
- 	PkBackendConfig *config = g_new0 (PkBackendConfig, 1);
-+	alpm_siglevel_t *level = g_new0 (alpm_siglevel_t, 1);
-+
- 	config->servers = g_hash_table_new_full (g_str_hash, g_str_equal,
- 						 g_free, NULL);
-+	config->levels = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-+						g_free);
-+
-+	*level |= ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL;
-+	*level |= ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
-+	g_hash_table_insert (config->levels, g_strdup ("options"), level);
-+
- 	config->xrepo = g_regex_new ("\\$repo", 0, 0, NULL);
- 	config->xarch = g_regex_new ("\\$arch", 0, 0, NULL);
-+
- 	return config;
- }
- 
-@@ -76,13 +91,14 @@ pk_backend_config_free (PkBackendConfig *config)
- 	g_free (config->arch);
- 	g_free (config->cleanmethod);
- 	g_free (config->dbpath);
-+	g_free (config->gpgdir);
- 	g_free (config->logfile);
- 	g_free (config->root);
- 	g_free (config->xfercmd);
- 
- 	FREELIST (config->cachedirs);
- 	FREELIST (config->holdpkgs);
--	FREELIST (config->ignoregrps);
-+	FREELIST (config->ignoregroups);
- 	FREELIST (config->ignorepkgs);
- 	FREELIST (config->noextracts);
- 	FREELIST (config->noupgrades);
-@@ -92,6 +108,8 @@ pk_backend_config_free (PkBackendConfig *config)
- 	g_hash_table_foreach_remove (config->servers,
- 				     pk_backend_config_servers_free, NULL);
- 	g_hash_table_unref (config->servers);
-+	g_hash_table_unref (config->levels);
-+
- 	g_regex_unref (config->xrepo);
- 	g_regex_unref (config->xarch);
- }
-@@ -113,14 +131,6 @@ pk_backend_config_set_ilovecandy (PkBackendConfig *config)
- }
- 
- static void
--pk_backend_config_set_showsize (PkBackendConfig *config)
--{
--	g_return_if_fail (config != NULL);
--
--	config->showsize = TRUE;
--}
--
--static void
- pk_backend_config_set_totaldl (PkBackendConfig *config)
- {
- 	g_return_if_fail (config != NULL);
-@@ -144,19 +154,28 @@ pk_backend_config_set_usesyslog (PkBackendConfig *config)
- 	config->usesyslog = TRUE;
- }
- 
--typedef struct {
--	const gchar *name;
--	void (*func) (PkBackendConfig *config);
-+static void
-+pk_backend_config_set_verbosepkglists (PkBackendConfig *config)
-+{
-+	g_return_if_fail (config != NULL);
-+
-+	config->verbosepkglists = TRUE;
-+}
-+
-+typedef struct
-+{
-+	 const gchar	*name;
-+	 void		(*func) (PkBackendConfig *config);
- } PkBackendConfigBoolean;
- 
- /* keep this in alphabetical order */
- static const PkBackendConfigBoolean pk_backend_config_boolean_options[] = {
- 	{ "CheckSpace", pk_backend_config_set_checkspace },
- 	{ "ILoveCandy", pk_backend_config_set_ilovecandy },
--	{ "ShowSize", pk_backend_config_set_showsize },
- 	{ "TotalDownload", pk_backend_config_set_totaldl },
- 	{ "UseDelta", pk_backend_config_set_usedelta },
- 	{ "UseSyslog", pk_backend_config_set_usesyslog },
-+	{ "VerbosePkgLists", pk_backend_config_set_verbosepkglists },
- 	{ NULL, NULL }
- };
- 
-@@ -234,6 +253,17 @@ pk_backend_config_set_dbpath (PkBackendConfig *config, const gchar *path)
- }
- 
- static void
-+pk_backend_config_set_gpgdir (PkBackendConfig *config, const gchar *path)
-+{
-+	g_return_if_fail (config != NULL);
-+	g_return_if_fail (path != NULL);
-+
-+	g_free (config->gpgdir);
-+	config->gpgdir = g_strdup (path);
-+}
-+
-+
-+static void
- pk_backend_config_set_logfile (PkBackendConfig *config, const gchar *filename)
- {
- 	g_return_if_fail (config != NULL);
-@@ -263,9 +293,10 @@ pk_backend_config_set_xfercmd (PkBackendConfig *config, const gchar *command)
- 	config->xfercmd = g_strdup (command);
- }
- 
--typedef struct {
--	const gchar *name;
--	void (*func) (PkBackendConfig *config, const gchar *s);
-+typedef struct
-+{
-+	 const gchar	*name;
-+	 void		(*func) (PkBackendConfig *config, const gchar *s);
- } PkBackendConfigString;
- 
- /* keep this in alphabetical order */
-@@ -274,6 +305,7 @@ static const PkBackendConfigString pk_backend_config_string_options[] = {
- 	{ "CacheDir", pk_backend_config_add_cachedir },
- 	{ "CleanMethod", pk_backend_config_set_cleanmethod },
- 	{ "DBPath", pk_backend_config_set_dbpath },
-+	{ "GPGDir", pk_backend_config_set_gpgdir },
- 	{ "LogFile", pk_backend_config_set_logfile },
- 	{ "RootDir", pk_backend_config_set_root },
- 	{ "XferCommand", pk_backend_config_set_xfercmd },
-@@ -313,12 +345,12 @@ pk_backend_config_add_holdpkg (PkBackendConfig *config, gchar *package)
- }
- 
- static void
--pk_backend_config_add_ignoregrp (PkBackendConfig *config, gchar *group)
-+pk_backend_config_add_ignoregroup (PkBackendConfig *config, gchar *group)
- {
- 	g_return_if_fail (config != NULL);
- 	g_return_if_fail (group != NULL);
- 
--	config->ignoregrps = alpm_list_add (config->ignoregrps, group);
-+	config->ignoregroups = alpm_list_add (config->ignoregroups, group);
- }
- 
- static void
-@@ -357,15 +389,16 @@ pk_backend_config_add_syncfirst (PkBackendConfig *config, gchar *package)
- 	config->syncfirsts = alpm_list_add (config->syncfirsts, package);
- }
- 
--typedef struct {
--	const gchar *name;
--	void (*func) (PkBackendConfig *config, gchar *value);
-+typedef struct
-+{
-+	const gchar	*name;
-+	void		(*func) (PkBackendConfig *config, gchar *value);
- } PkBackendConfigList;
- 
- /* keep this in alphabetical order */
- static const PkBackendConfigList pk_backend_config_list_options[] = {
- 	{ "HoldPkg", pk_backend_config_add_holdpkg },
--	{ "IgnoreGroup", pk_backend_config_add_ignoregrp },
-+	{ "IgnoreGroup", pk_backend_config_add_ignoregroup },
- 	{ "IgnorePkg", pk_backend_config_add_ignorepkg },
- 	{ "NoExtract", pk_backend_config_add_noextract },
- 	{ "NoUpgrade", pk_backend_config_add_noupgrade },
-@@ -451,7 +484,7 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo,
- 			return FALSE;
- 		}
- 	} else if (strstr (url, "$arch") != NULL) {
--		g_set_error (e, ALPM_ERROR, PM_ERR_CONFIG_INVALID,
-+		g_set_error (e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
- 			     "url contained $arch, which is not set");
- 	}
- 
-@@ -463,6 +496,95 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo,
- }
- 
- static gboolean
-+pk_backend_config_set_siglevel (PkBackendConfig *config, const gchar *section,
-+				const gchar *list, GError **error)
-+{
-+	alpm_siglevel_t *level;
-+
-+	g_return_val_if_fail (config != NULL, FALSE);
-+	g_return_val_if_fail (section != NULL, FALSE);
-+	g_return_val_if_fail (list != NULL, FALSE);
-+
-+	level = g_hash_table_lookup (config->levels, section);
-+	if (level == NULL) {
-+		level = g_hash_table_lookup (config->levels, "options");
-+		level = g_memdup (level, sizeof (alpm_siglevel_t));
-+		g_hash_table_insert (config->levels, g_strdup (section), level);
-+	}
-+
-+	while (TRUE) {
-+		gboolean package = TRUE, database = TRUE;
-+
-+		if (g_str_has_prefix (list, "Package")) {
-+			database = FALSE;
-+			list += 7;
-+		} else if (g_str_has_prefix (list, "Database")) {
-+			package = FALSE;
-+			list += 8;
-+		}
-+
-+		/* this also allows e.g. NeverEver, so put prefixes last */
-+		if (g_str_has_prefix (list, "Never") == 0) {
-+			if (package) {
-+				*level &= ~ALPM_SIG_PACKAGE;
-+			}
-+			if (database) {
-+				*level &= ~ALPM_SIG_DATABASE;
-+			}
-+		} else if (g_str_has_prefix (list, "Optional") == 0) {
-+			if (package) {
-+				*level |= ALPM_SIG_PACKAGE;
-+				*level |= ALPM_SIG_PACKAGE_OPTIONAL;
-+			}
-+			if (database) {
-+				*level |= ALPM_SIG_DATABASE;
-+				*level |= ALPM_SIG_DATABASE_OPTIONAL;
-+			}
-+		} else if (g_str_has_prefix (list, "Required") == 0) {
-+			if (package) {
-+				*level |= ALPM_SIG_PACKAGE;
-+				*level &= ~ALPM_SIG_PACKAGE_OPTIONAL;
-+			}
-+			if (database) {
-+				*level |= ALPM_SIG_DATABASE;
-+				*level &= ~ALPM_SIG_DATABASE_OPTIONAL;
-+			}
-+		} else if (g_str_has_prefix (list, "TrustedOnly") == 0) {
-+			if (package) {
-+				*level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK;
-+				*level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK;
-+			}
-+			if (database) {
-+				*level &= ~ALPM_SIG_DATABASE_MARGINAL_OK;
-+				*level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK;
-+			}
-+		} else if (g_str_has_prefix (list, "TrustAll") == 0) {
-+			if (package) {
-+				*level |= ALPM_SIG_PACKAGE_MARGINAL_OK;
-+				*level |= ALPM_SIG_PACKAGE_UNKNOWN_OK;
-+			}
-+			if (database) {
-+				*level |= ALPM_SIG_DATABASE_MARGINAL_OK;
-+				*level |= ALPM_SIG_DATABASE_UNKNOWN_OK;
-+			}
-+		} else {
-+			g_set_error (error, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
-+				     "invalid SigLevel value: %s", list);
-+			return FALSE;
-+		}
-+
-+		list = strchr (list, ' ');
-+		if (list == NULL) {
-+			break;
-+		} else {
-+			++list;
-+		}
-+	}
-+
-+	return TRUE;
-+}
-+
-+static gboolean
- pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 			 gchar *section, GError **error)
- {
-@@ -515,7 +637,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 
- 			if (*str == '\0') {
- 				g_set_error (&e, ALPM_ERROR,
--					     PM_ERR_CONFIG_INVALID,
-+					     ALPM_ERR_CONFIG_INVALID,
- 					     "empty section name");
- 				break;
- 			}
-@@ -532,7 +654,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 
- 		/* parse a directive */
- 		if (section == NULL) {
--			g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID,
-+			g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
- 				     "directive must belong to a section");
- 			break;
- 		}
-@@ -590,9 +712,18 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 				continue;
- 			}
- 		}
-+	
-+		if (g_strcmp0 (key, "SigLevel") == 0 && str != NULL) {
-+			if (!pk_backend_config_set_siglevel (config, section,
-+							     str, &e)) {
-+				break;
-+			} else {
-+				continue;
-+			}
-+		}
- 
- 		/* report errors from above */
--		g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID,
-+		g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
- 			     "unrecognised directive '%s'", key);
- 		break;
- 	}
-@@ -611,107 +742,100 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
- 	}
- }
- 
--static gboolean
--pk_backend_config_configure_paths (PkBackendConfig *config, GError **error)
-+static alpm_handle_t *
-+pk_backend_config_initialize_alpm (PkBackendConfig *config, GError **error)
- {
-+	alpm_handle_t *handle;
-+	enum _alpm_errno_t errno;
-+	gsize dir = 1;
-+
- 	g_return_val_if_fail (config != NULL, FALSE);
- 
--	if (config->root == NULL) {
-+	if (config->root == NULL || *config->root == '\0') {
- 		config->root = g_strdup (PK_BACKEND_DEFAULT_ROOT);
-+	} else if (!g_str_has_suffix (config->root, G_DIR_SEPARATOR_S)) {
-+		dir = 0;
- 	}
- 
--	if (alpm_option_set_root (config->root) < 0) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "RootDir: %s",
--			     alpm_strerrorlast ());
--		return FALSE;
-+	if (config->dbpath == NULL) {
-+		config->dbpath = g_strconcat (config->root,
-+					      PK_BACKEND_DEFAULT_DBPATH + dir,
-+					      NULL);
- 	}
- 
--	if (config->dbpath == NULL) {
--		config->dbpath = g_strconcat (alpm_option_get_root (),
--					      PK_BACKEND_DEFAULT_DBPATH + 1,
-+	g_debug ("initializing alpm");
-+	handle = alpm_initialize (config->root, config->dbpath, &errno);
-+	if (handle == NULL) {
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
-+		return handle;
-+	}
-+
-+	if (config->gpgdir == NULL) {
-+		config->gpgdir = g_strconcat (config->root,
-+					      PK_BACKEND_DEFAULT_GPGDIR + dir,
- 					      NULL);
- 	}
- 
--	if (alpm_option_set_dbpath (config->dbpath) < 0) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "DBPath: %s",
--			     alpm_strerrorlast ());
--		return FALSE;
-+	if (alpm_option_set_gpgdir (handle, config->gpgdir) < 0) {
-+		errno = alpm_errno (handle);
-+		g_set_error (error, ALPM_ERROR, errno, "GPGDir: %s",
-+			     alpm_strerror (errno));
-+		return handle;
- 	}
- 
- 	if (config->logfile == NULL) {
--		config->logfile = g_strconcat (alpm_option_get_root (),
--					       PK_BACKEND_DEFAULT_LOGFILE + 1,
-+		config->logfile = g_strconcat (config->root,
-+					       PK_BACKEND_DEFAULT_LOGFILE + dir,
- 					       NULL);
- 	}
- 
--	alpm_option_set_logfile (config->logfile);
-+	if (alpm_option_set_logfile (handle, config->logfile) < 0) {
-+		errno = alpm_errno (handle);
-+		g_set_error (error, ALPM_ERROR, errno, "LogFile: %s",
-+			     alpm_strerror (errno));
-+		return handle;
-+	}
- 
- 	if (config->cachedirs == NULL) {
--		gchar *path = g_strconcat (alpm_option_get_root (),
--					   PK_BACKEND_DEFAULT_CACHEDIR + 1,
-+		gchar *path = g_strconcat (config->root,
-+					   PK_BACKEND_DEFAULT_CACHEDIR + dir,
- 					   NULL);
- 		config->cachedirs = alpm_list_add (NULL, path);
- 	}
- 
- 	/* alpm takes ownership */
--	alpm_option_set_cachedirs (config->cachedirs);
-+	if (alpm_option_set_cachedirs (handle, config->cachedirs) < 0) {
-+		errno = alpm_errno (handle);
-+		g_set_error (error, ALPM_ERROR, errno, "CacheDir: %s",
-+			     alpm_strerror (errno));
-+		return handle;
-+	}
- 	config->cachedirs = NULL;
- 
--	return TRUE;
-+	return handle;
- }
- 
--static gboolean
--pk_backend_config_configure_repos (PkBackendConfig *config, GError **error)
-+static alpm_handle_t *
-+pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
- {
--	const alpm_list_t *i;
-+	alpm_handle_t *handle;
-+	alpm_siglevel_t *level;
- 
- 	g_return_val_if_fail (config != NULL, FALSE);
- 
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		if (alpm_db_unregister (i->data) < 0) {
--			g_set_error_literal (error, ALPM_ERROR, pm_errno,
--					     alpm_strerrorlast ());
--			return FALSE;
--		}
--	}
--
--	for (i = config->repos; i != NULL; i = i->next) {
--		const gchar *key;
--		gpointer value;
--		pmdb_t *db;
--		alpm_list_t *j;
--
--		key = (const gchar *) i->data;
--		value = g_hash_table_lookup (config->servers, key);
--
--		db = alpm_db_register_sync (key);
--		if (db == NULL) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s",
--				     key, alpm_strerrorlast ());
--			return FALSE;
--		}
--
--		for (j = (alpm_list_t *) value; j != NULL; j = j->next) {
--			alpm_db_setserver (db, (const gchar *) j->data);
--		}
-+	handle = pk_backend_config_initialize_alpm (config, error);
-+	if (handle == NULL) {
-+		return NULL;
- 	}
- 
--	return TRUE;
--}
--
--static gboolean
--pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
--{
--	g_return_val_if_fail (config != NULL, FALSE);
--
--	if (!pk_backend_config_configure_paths (config, error)) {
--		return FALSE;
--	}
-+	alpm_option_set_checkspace (handle, config->checkspace);
-+	alpm_option_set_usedelta (handle, config->usedelta);
-+	alpm_option_set_usesyslog (handle, config->usesyslog);
-+	alpm_option_set_arch (handle, config->arch);
- 
--	alpm_option_set_checkspace (config->checkspace);
--	alpm_option_set_usedelta (config->usedelta);
--	alpm_option_set_usesyslog (config->usesyslog);
--	alpm_option_set_arch (config->arch);
-+	level = g_hash_table_lookup (config->levels, "options");
-+	alpm_option_set_default_siglevel (handle, *level);
- 
- 	/* backend takes ownership */
- 	g_free (xfercmd);
-@@ -719,9 +843,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
- 	config->xfercmd = NULL;
- 
- 	if (xfercmd != NULL) {
--		alpm_option_set_fetchcb (pk_backend_fetchcb);
-+		alpm_option_set_fetchcb (handle, pk_backend_fetchcb);
- 	} else {
--		alpm_option_set_fetchcb (NULL);
-+		alpm_option_set_fetchcb (handle, NULL);
- 	}
- 
- 	/* backend takes ownership */
-@@ -735,41 +859,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
- 	config->syncfirsts = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_ignoregrps (config->ignoregrps);
--	config->ignoregrps = NULL;
-+	alpm_option_set_ignoregroups (handle, config->ignoregroups);
-+	config->ignoregroups = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_ignorepkgs (config->ignorepkgs);
-+	alpm_option_set_ignorepkgs (handle, config->ignorepkgs);
- 	config->ignorepkgs = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_noextracts (config->noextracts);
-+	alpm_option_set_noextracts (handle, config->noextracts);
- 	config->noextracts = NULL;
- 
- 	/* alpm takes ownership */
--	alpm_option_set_noupgrades (config->noupgrades);
-+	alpm_option_set_noupgrades (handle, config->noupgrades);
- 	config->noupgrades = NULL;
- 
--	if (!pk_backend_config_configure_repos (config, error)) {
--		return FALSE;
--	}
-+	pk_backend_configure_repos (config->repos, config->servers,
-+				    config->levels);
- 
--	return TRUE;
-+	return handle;
- }
- 
--gboolean
-+alpm_handle_t *
- pk_backend_configure (const gchar *filename, GError **error)
- {
- 	PkBackendConfig *config;
--	gboolean result;
-+	alpm_handle_t *handle;
-+	GError *e = NULL;
- 
- 	g_return_val_if_fail (filename != NULL, FALSE);
- 
-+	g_debug ("reading config from %s", filename);
- 	config = pk_backend_config_new ();
- 
--	result = pk_backend_config_parse (config, filename, NULL, error) &&
--		 pk_backend_config_configure_alpm (config, error);
-+	if (pk_backend_config_parse (config, filename, NULL, &e)) {
-+		handle = pk_backend_config_configure_alpm (config, &e);
-+	} else {
-+		handle = NULL;
-+	}
- 
- 	pk_backend_config_free (config);
--	return result;
-+	if (e != NULL) {
-+		g_propagate_error (error, e);
-+		if (handle != NULL) {
-+			alpm_release (handle);
-+		}
-+		return NULL;
-+	} else {
-+		return handle;
-+	}
- }
-diff --git a/backends/alpm/pk-backend-config.h b/backends/alpm/pk-backend-config.h
-index cb8b8dc..412f59c 100644
---- a/backends/alpm/pk-backend-config.h
-+++ b/backends/alpm/pk-backend-config.h
-@@ -21,6 +21,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#include <alpm.h>
- #include <glib.h>
- 
--gboolean	 pk_backend_configure	(const gchar *filename, GError **error);
-+alpm_handle_t	*pk_backend_configure	(const gchar *filename, GError **error);
-diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c
-index f6ab06e..ac530c7 100644
---- a/backends/alpm/pk-backend-databases.c
-+++ b/backends/alpm/pk-backend-databases.c
-@@ -26,7 +26,15 @@
- #include "pk-backend-databases.h"
- #include "pk-backend-error.h"
- 
-+typedef struct
-+{
-+	gchar *name;
-+	alpm_list_t *servers;
-+	alpm_siglevel_t level;
-+} PkBackendRepo;
-+
- static GHashTable *disabled = NULL;
-+static alpm_list_t *configured = NULL;
- 
- static GHashTable *
- disabled_repos_new (GError **error)
-@@ -113,8 +121,8 @@ disabled_repos_free (GHashTable *table)
- 
- 	/* write all disabled repos line by line */
- 	while (g_hash_table_iter_next (&iter, (gpointer *) &line, NULL) &&
--		g_data_output_stream_put_string (output, line, NULL, NULL) &&
--		g_data_output_stream_put_byte (output, '\n', NULL, NULL));
-+	       g_data_output_stream_put_string (output, line, NULL, NULL) &&
-+	       g_data_output_stream_put_byte (output, '\n', NULL, NULL));
- 
- 	g_object_unref (output);
- 	g_object_unref (os);
-@@ -128,37 +136,65 @@ disabled_repos_configure (GHashTable *table, GError **error)
- {
- 	const alpm_list_t *i;
- 
--	g_debug ("reading config from %s", PK_BACKEND_CONFIG_FILE);
-+	g_return_val_if_fail (table != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
--	/* read configuration from pacman.conf file */
--	if (!pk_backend_configure (PK_BACKEND_CONFIG_FILE, error)) {
-+	if (alpm_db_unregister_all (alpm) < 0) {
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 		return FALSE;
- 	}
- 
--	/* disable disabled repos */
--	for (i = alpm_option_get_syncdbs (); i != NULL;) {
--		pmdb_t *db = (pmdb_t *) i->data;
--		const gchar *repo = alpm_db_get_name (db);
-+	for (i = configured; i != NULL; i = i->next) {
-+		PkBackendRepo *repo = (PkBackendRepo *) i->data;
-+		alpm_db_t *db;
- 
--		if (g_hash_table_lookup (table, repo) == NULL) {
--			/* repo is not disabled */
--			i = i->next;
-+		if (g_hash_table_lookup (table, repo->name) != NULL) {
-+			/* repo is disabled */
- 			continue;
- 		}
- 
--		if (alpm_db_unregister (db) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s",
--				     repo, alpm_strerrorlast ());
-+		db = alpm_db_register_sync (alpm, repo->name, repo->level);
-+		if (db == NULL) {
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "[%s]: %s",
-+				     repo->name, alpm_strerror (errno));
- 			return FALSE;
- 		}
- 
--		/* start again because the list gets invalidated */
--		i = alpm_option_get_syncdbs ();
-+		alpm_db_set_servers (db, alpm_list_strdup (repo->servers));
- 	}
- 
- 	return TRUE;
- }
- 
-+void
-+pk_backend_configure_repos (alpm_list_t *repos, GHashTable *servers,
-+			    GHashTable *levels)
-+{
-+	alpm_list_t *i;
-+
-+	g_return_if_fail (servers != NULL);
-+
-+	for (i = repos; i != NULL; i = i->next) {
-+		PkBackendRepo *repo = g_new (PkBackendRepo, 1);
-+		gpointer value = g_hash_table_lookup (servers, i->data);
-+
-+		repo->name = g_strdup ((const gchar *) i->data);
-+		repo->servers = alpm_list_strdup ((alpm_list_t *) value);
-+
-+		value = g_hash_table_lookup (levels, i->data);
-+		if (value != NULL) {
-+			repo->level = *(alpm_siglevel_t *)value;
-+		} else {
-+			repo->level = ALPM_SIG_USE_DEFAULT;
-+		}
-+
-+		configured = alpm_list_add (configured, repo);
-+	}
-+}
-+
- gboolean
- pk_backend_initialize_databases (PkBackend *self, GError **error)
- {
-@@ -179,11 +215,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error)
- void
- pk_backend_destroy_databases (PkBackend *self)
- {
-+	alpm_list_t *i;
-+
- 	g_return_if_fail (self != NULL);
- 
- 	if (disabled != NULL) {
- 		disabled_repos_free (disabled);
- 	}
-+
-+	for (i = configured; i != NULL; i = i->next) {
-+		PkBackendRepo *repo = (PkBackendRepo *) i->data;
-+		g_free (repo->name);
-+		FREELIST (repo->servers);
-+		g_free (repo);
-+	}
-+	alpm_list_free (configured);
- }
- 
- static gboolean
-@@ -210,11 +256,12 @@ pk_backend_get_repo_list_thread (PkBackend *self)
- 	gpointer key, value;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (disabled != NULL, FALSE);
- 
- 	/* emit enabled repos */
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		pmdb_t *db = (pmdb_t *) i->data;
-+	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
-+		alpm_db_t *db = (alpm_db_t *) i->data;
- 		const gchar *repo = alpm_db_get_name (db);
- 
- 		if (pk_backend_cancelled (self)) {
-@@ -269,7 +316,7 @@ pk_backend_repo_enable_thread (PkBackend *self)
- 			pk_backend_repo_list_changed (self);
- 		}
- 	} else {
--		int code = PM_ERR_DB_NOT_NULL;
-+		int code = ALPM_ERR_DB_NOT_NULL;
- 		g_set_error (&error, ALPM_ERROR, code, "[%s]: %s",
- 			     repo, alpm_strerror (code));
- 	}
-@@ -292,21 +339,23 @@ pk_backend_repo_disable_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (disabled != NULL, FALSE);
- 
- 	repo = pk_backend_get_string (self, "repo_id");
- 
- 	g_return_val_if_fail (repo != NULL, FALSE);
- 
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		pmdb_t *db = (pmdb_t *) i->data;
-+	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
-+		alpm_db_t *db = (alpm_db_t *) i->data;
- 		const gchar *name = alpm_db_get_name (db);
- 
- 		if (g_strcmp0 (repo, name) == 0) {
- 			if (alpm_db_unregister (db) < 0) {
--				g_set_error (&error, ALPM_ERROR, pm_errno,
-+				enum _alpm_errno_t errno = alpm_errno (alpm);
-+				g_set_error (&error, ALPM_ERROR, errno,
- 					     "[%s]: %s", repo,
--					     alpm_strerrorlast ());
-+					     alpm_strerror (errno));
- 			} else {
- 				g_hash_table_insert (disabled, g_strdup (repo),
- 						     GINT_TO_POINTER (1));
-@@ -316,7 +365,7 @@ pk_backend_repo_disable_thread (PkBackend *self)
- 	}
- 
- 	if (i == NULL) {
--		int code = PM_ERR_DB_NULL;
-+		int code = ALPM_ERR_DB_NULL;
- 		g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", repo,
- 			     alpm_strerror (code));
- 	}
-diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h
-index f9eb2f9..2636cae 100644
---- a/backends/alpm/pk-backend-databases.h
-+++ b/backends/alpm/pk-backend-databases.h
-@@ -24,6 +24,10 @@
- #include <alpm.h>
- #include <pk-backend.h>
- 
-+void		 pk_backend_configure_repos		(alpm_list_t *repos,
-+							 GHashTable *servers,
-+							 GHashTable *levels);
-+
- gboolean	 pk_backend_initialize_databases	(PkBackend *self,
- 							 GError **error);
- 
-diff --git a/backends/alpm/pk-backend-depends.c b/backends/alpm/pk-backend-depends.c
-index 8bb8567..7c7b45a 100644
---- a/backends/alpm/pk-backend-depends.c
-+++ b/backends/alpm/pk-backend-depends.c
-@@ -29,7 +29,7 @@
- #include "pk-backend-error.h"
- #include "pk-backend-packages.h"
- 
--static pmpkg_t *
-+static alpm_pkg_t *
- alpm_list_find_pkg (const alpm_list_t *pkgs, const gchar *name)
- {
- 	g_return_val_if_fail (name != NULL, NULL);
-@@ -50,11 +50,12 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
- 	PkBitfield filters;
- 	gboolean recursive, skip_local, skip_remote;
- 
--	pmpkg_t *provider;
-+	alpm_pkg_t *provider;
- 	alpm_list_t *pkgcache, *syncdbs;
- 
- 	g_return_val_if_fail (self != NULL, pkgs);
- 	g_return_val_if_fail (depend != NULL, pkgs);
-+	g_return_val_if_fail (alpm != NULL, pkgs);
- 	g_return_val_if_fail (localdb != NULL, pkgs);
- 
- 	recursive = pk_backend_get_bool (self, "recursive");
-@@ -84,8 +85,8 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
- 	}
- 
- 	/* look for remote dependencies */
--	syncdbs = alpm_option_get_syncdbs ();
--	provider = alpm_find_dbs_satisfier (syncdbs, depend);
-+	syncdbs = alpm_option_get_syncdbs (alpm);
-+	provider = alpm_find_dbs_satisfier (alpm, syncdbs, depend);
- 
- 	if (provider != NULL) {
- 		if (!skip_remote) {
-@@ -96,7 +97,7 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
- 			pkgs = alpm_list_add (pkgs, provider);
- 		}
- 	} else {
--		int code = PM_ERR_UNSATISFIED_DEPS;
-+		int code = ALPM_ERR_UNSATISFIED_DEPS;
- 		g_set_error (error, ALPM_ERROR, code, "%s: %s", depend,
- 			     alpm_strerror (code));
- 	}
-@@ -108,7 +109,7 @@ static alpm_list_t *
- pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name,
- 			  GError **error)
- {
--	pmpkg_t *requirer;
-+	alpm_pkg_t *requirer;
- 
- 	g_return_val_if_fail (self != NULL, pkgs);
- 	g_return_val_if_fail (name != NULL, pkgs);
-@@ -127,7 +128,7 @@ pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name,
- 			pkgs = alpm_list_add (pkgs, requirer);
- 		}
- 	} else {
--		int code = PM_ERR_PKG_NOT_FOUND;
-+		int code = ALPM_ERR_PKG_NOT_FOUND;
- 		g_set_error (error, ALPM_ERROR, code, "%s: %s", name,
- 			     alpm_strerror (code));
- 	}
-@@ -150,7 +151,7 @@ pk_backend_get_depends_thread (PkBackend *self)
- 
- 	/* construct an initial package list */
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
-+		alpm_pkg_t *pkg;
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
-@@ -206,7 +207,7 @@ pk_backend_get_requires_thread (PkBackend *self)
- 
- 	/* construct an initial package list */
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
-+		alpm_pkg_t *pkg;
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
-diff --git a/backends/alpm/pk-backend-error.c b/backends/alpm/pk-backend-error.c
-index 255f1fb..57c4b4b 100644
---- a/backends/alpm/pk-backend-error.c
-+++ b/backends/alpm/pk-backend-error.c
-@@ -33,140 +33,159 @@ pk_backend_error (PkBackend *self, GError *error)
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (error != NULL);
- 
--	if (error->domain == ALPM_ERROR) {
--		switch (error->code) {
--			case PM_ERR_MEMORY:
--			case PM_ERR_SYSTEM:
--				code = PK_ERROR_ENUM_OOM;
--				break;
-+	if (error->domain != ALPM_ERROR) {
-+		pk_backend_error_code (self, code, "%s", error->message);
-+		return;
-+	}
-+
-+	switch (error->code) {
-+		case ALPM_ERR_MEMORY:
-+		case ALPM_ERR_SYSTEM:
-+			code = PK_ERROR_ENUM_OOM;
-+			break;
-+
-+		case ALPM_ERR_BADPERMS:
-+			code = PK_ERROR_ENUM_NOT_AUTHORIZED;
-+			break;
-+
-+		case ALPM_ERR_NOT_A_FILE:
-+		case ALPM_ERR_NOT_A_DIR:
-+			code = PK_ERROR_ENUM_FILE_NOT_FOUND;
-+			break;
-+
-+		case ALPM_ERR_WRONG_ARGS:
-+		case ALPM_ERR_HANDLE_NULL:
-+		case ALPM_ERR_DB_NULL:
-+		case ALPM_ERR_TRANS_NULL:
-+		case ALPM_ERR_TRANS_NOT_INITIALIZED:
-+		case ALPM_ERR_TRANS_NOT_PREPARED:
-+		case ALPM_ERR_TRANS_NOT_LOCKED:
-+		case ALPM_ERR_INVALID_REGEX:
-+			code = PK_ERROR_ENUM_INTERNAL_ERROR;
-+			break;
- 
--			case PM_ERR_BADPERMS:
--				code = PK_ERROR_ENUM_NOT_AUTHORIZED;
--				break;
-+		case ALPM_ERR_DISK_SPACE:
-+			code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE;
-+			break;
- 
--			case PM_ERR_NOT_A_FILE:
--			case PM_ERR_NOT_A_DIR:
--				code = PK_ERROR_ENUM_FILE_NOT_FOUND;
--				break;
-+		case ALPM_ERR_HANDLE_NOT_NULL:
-+		case ALPM_ERR_DB_NOT_NULL:
-+		case ALPM_ERR_TRANS_NOT_NULL:
-+			code = PK_ERROR_ENUM_FAILED_INITIALIZATION;
-+			break;
- 
--			case PM_ERR_WRONG_ARGS:
--			case PM_ERR_HANDLE_NULL:
--			case PM_ERR_DB_NULL:
--			case PM_ERR_TRANS_NULL:
--			case PM_ERR_TRANS_NOT_INITIALIZED:
--			case PM_ERR_TRANS_NOT_PREPARED:
--			case PM_ERR_TRANS_NOT_LOCKED:
--			case PM_ERR_INVALID_REGEX:
--				code = PK_ERROR_ENUM_INTERNAL_ERROR;
--				break;
-+		case ALPM_ERR_HANDLE_LOCK:
-+			code = PK_ERROR_ENUM_CANNOT_GET_LOCK;
-+			break;
- 
--			case PM_ERR_DISK_SPACE:
--				code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE;
--				break;
-+		case ALPM_ERR_DB_OPEN:
-+		case ALPM_ERR_DB_NOT_FOUND:
-+		case ALPM_ERR_PKG_REPO_NOT_FOUND:
-+			code = PK_ERROR_ENUM_REPO_NOT_FOUND;
-+			break;
- 
--			case PM_ERR_HANDLE_NOT_NULL:
--			case PM_ERR_DB_NOT_NULL:
--			case PM_ERR_TRANS_NOT_NULL:
--				code = PK_ERROR_ENUM_FAILED_INITIALIZATION;
--				break;
-+		case ALPM_ERR_DB_CREATE:
-+			code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG;
-+			break;
- 
--			case PM_ERR_HANDLE_LOCK:
--				code = PK_ERROR_ENUM_CANNOT_GET_LOCK;
--				break;
-+		case ALPM_ERR_DB_INVALID:
-+		case ALPM_ERR_DB_VERSION:
-+		case ALPM_ERR_DB_REMOVE:
-+		case ALPM_ERR_SERVER_BAD_URL:
-+			code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
-+			break;
- 
--			case PM_ERR_DB_OPEN:
--			case PM_ERR_DB_NOT_FOUND:
--			case PM_ERR_PKG_REPO_NOT_FOUND:
--				code = PK_ERROR_ENUM_REPO_NOT_FOUND;
--				break;
-+		case ALPM_ERR_DB_INVALID_SIG:
-+		case ALPM_ERR_PKG_INVALID_SIG:
-+		case ALPM_ERR_SIG_INVALID:
-+			code = PK_ERROR_ENUM_BAD_GPG_SIGNATURE;
-+			break;
- 
--			case PM_ERR_DB_CREATE:
--				code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG;
--				break;
-+		case ALPM_ERR_DB_WRITE:
-+			code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE;
-+			break;
- 
--			case PM_ERR_DB_VERSION:
--			case PM_ERR_DB_REMOVE:
--				code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
--				break;
-+		case ALPM_ERR_SERVER_NONE:
-+			code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY;
-+			break;
- 
--			case PM_ERR_DB_WRITE:
--				code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE;
--				break;
-+		case ALPM_ERR_TRANS_DUP_TARGET:
-+		case ALPM_ERR_TRANS_ABORT:
-+			code = PK_ERROR_ENUM_TRANSACTION_ERROR;
-+			break;
- 
--			case PM_ERR_SERVER_BAD_URL:
--				code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR;
--				break;
-+		case ALPM_ERR_TRANS_TYPE:
-+			code = PK_ERROR_ENUM_CANNOT_CANCEL;
-+			break;
- 
--			case PM_ERR_SERVER_NONE:
--				code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY;
--				break;
-+		case ALPM_ERR_PKG_NOT_FOUND:
-+			code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND;
-+			break;
- 
--			case PM_ERR_TRANS_DUP_TARGET:
--			case PM_ERR_TRANS_ABORT:
--				code = PK_ERROR_ENUM_TRANSACTION_ERROR;
--				break;
-+		case ALPM_ERR_PKG_IGNORED:
-+			code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED;
-+			break;
- 
--			case PM_ERR_TRANS_TYPE:
--				code = PK_ERROR_ENUM_CANNOT_CANCEL;
--				break;
-+		case ALPM_ERR_PKG_INVALID:
-+		case ALPM_ERR_PKG_OPEN:
-+		case ALPM_ERR_PKG_INVALID_NAME:
-+		case ALPM_ERR_DLT_INVALID:
-+			code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE;
-+			break;
- 
--			case PM_ERR_PKG_NOT_FOUND:
--				code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND;
--				break;
-+		case ALPM_ERR_PKG_INVALID_CHECKSUM:
-+			code = PK_ERROR_ENUM_PACKAGE_CORRUPT;
-+			break;
- 
--			case PM_ERR_PKG_IGNORED:
--				code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED;
--				break;
-+		case ALPM_ERR_PKG_CANT_REMOVE:
-+			code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE;
-+			break;
- 
--			case PM_ERR_PKG_INVALID:
--			case PM_ERR_PKG_OPEN:
--			case PM_ERR_PKG_INVALID_NAME:
--			case PM_ERR_DLT_INVALID:
--				code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE;
--				break;
-+		case ALPM_ERR_PKG_INVALID_ARCH:
-+			code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE;
-+			break;
- 
--			case PM_ERR_PKG_CANT_REMOVE:
--				code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE;
--				break;
-+		case ALPM_ERR_SIG_MISSING:
-+			code = PK_ERROR_ENUM_MISSING_GPG_SIGNATURE;
-+			break;
- 
--			case PM_ERR_PKG_INVALID_ARCH:
--				code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE;
--				break;
-+		case ALPM_ERR_DLT_PATCHFAILED:
-+			code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD;
-+			break;
- 
--			case PM_ERR_DLT_PATCHFAILED:
--				code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD;
--				break;
-+		case ALPM_ERR_UNSATISFIED_DEPS:
-+			code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED;
-+			break;
- 
--			case PM_ERR_UNSATISFIED_DEPS:
--				code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED;
--				break;
-+		case ALPM_ERR_CONFLICTING_DEPS:
-+			code = PK_ERROR_ENUM_PACKAGE_CONFLICTS;
-+			break;
- 
--			case PM_ERR_CONFLICTING_DEPS:
--				code = PK_ERROR_ENUM_PACKAGE_CONFLICTS;
--				break;
-+		case ALPM_ERR_FILE_CONFLICTS:
-+			code = PK_ERROR_ENUM_FILE_CONFLICTS;
-+			break;
- 
--			case PM_ERR_FILE_CONFLICTS:
--				code = PK_ERROR_ENUM_FILE_CONFLICTS;
--				break;
-+		case ALPM_ERR_RETRIEVE:
-+		case ALPM_ERR_LIBCURL:
-+		case ALPM_ERR_EXTERNAL_DOWNLOAD:
-+			code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED;
-+			break;
- 
--			case PM_ERR_RETRIEVE:
--			case PM_ERR_LIBFETCH:
--			case PM_ERR_EXTERNAL_DOWNLOAD:
--				code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED;
--				break;
-+		case ALPM_ERR_LIBARCHIVE:
-+			code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED;
-+			break;
- 
--			case PM_ERR_LIBARCHIVE:
--				code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED;
--				break;
-+		case ALPM_ERR_GPGME:
-+			code = PK_ERROR_ENUM_GPG_FAILURE;
-+			break;
- 
--			case PM_ERR_CONFIG_INVALID:
--				code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
--				break;
-+		case ALPM_ERR_CONFIG_INVALID:
-+			code = PK_ERROR_ENUM_FAILED_CONFIG_PARSING;
-+			break;
- 
--			case PM_ERR_PKG_HELD:
--				code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
--				break;
--		}
-+		case ALPM_ERR_PKG_HELD:
-+			code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE;
-+			break;
- 	}
- 
- 	pk_backend_error_code (self, code, "%s", error->message);
-diff --git a/backends/alpm/pk-backend-error.h b/backends/alpm/pk-backend-error.h
-index 83fe4a5..0a029e4 100644
---- a/backends/alpm/pk-backend-error.h
-+++ b/backends/alpm/pk-backend-error.h
-@@ -26,8 +26,8 @@
- #define	 ALPM_ERROR		(alpm_error_quark ())
- 
- enum {
--	PM_ERR_CONFIG_INVALID = 0x10000,
--	PM_ERR_PKG_HELD
-+	ALPM_ERR_CONFIG_INVALID = 0x10000,
-+	ALPM_ERR_PKG_HELD
- };
- 
- void	 pk_backend_error	(PkBackend *self, GError *error);
-diff --git a/backends/alpm/pk-backend-groups.c b/backends/alpm/pk-backend-groups.c
-index 59e304d..6056c54 100644
---- a/backends/alpm/pk-backend-groups.c
-+++ b/backends/alpm/pk-backend-groups.c
-@@ -125,7 +125,7 @@ pk_backend_destroy_groups (PkBackend *self)
- }
- 
- const gchar *
--alpm_pkg_get_group (pmpkg_t *pkg)
-+alpm_pkg_get_group (alpm_pkg_t *pkg)
- {
- 	const alpm_list_t *i;
- 
-diff --git a/backends/alpm/pk-backend-groups.h b/backends/alpm/pk-backend-groups.h
-index 28dcf65..d736e37 100644
---- a/backends/alpm/pk-backend-groups.h
-+++ b/backends/alpm/pk-backend-groups.h
-@@ -29,4 +29,4 @@ gboolean	 pk_backend_initialize_groups	(PkBackend *self,
- 
- void		 pk_backend_destroy_groups	(PkBackend *self);
- 
--const gchar	*alpm_pkg_get_group		(pmpkg_t *pkg);
-+const gchar	*alpm_pkg_get_group		(alpm_pkg_t *pkg);
-diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c
-index 65a6c11..5b5e2b2 100644
---- a/backends/alpm/pk-backend-install.c
-+++ b/backends/alpm/pk-backend-install.c
-@@ -32,15 +32,19 @@
- static gint
- alpm_add_file (const gchar *filename)
- {
--	pmpkg_t *pkg;
-+	alpm_pkg_t *pkg;
-+	alpm_siglevel_t level;
- 
- 	g_return_val_if_fail (filename != NULL, -1);
-+	g_return_val_if_fail (alpm != NULL, -1);
- 
--	if (alpm_pkg_load (filename, 1, &pkg) < 0) {
-+	level = alpm_option_get_default_siglevel (alpm);
-+
-+	if (alpm_pkg_load (alpm, filename, 1, level, &pkg) < 0) {
- 		return -1;
- 	}
- 
--	if (alpm_add_pkg (pkg) < 0) {
-+	if (alpm_add_pkg (alpm, pkg) < 0) {
- 		alpm_pkg_free (pkg);
- 		return -1;
- 	}
-@@ -61,8 +65,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error)
- 
- 	for (; *paths != NULL; ++paths) {
- 		if (alpm_add_file (*paths) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s",
--				     *paths, alpm_strerrorlast ());
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "%s: %s",
-+				     *paths, alpm_strerror (errno));
- 			return FALSE;
- 		}
- 	}
-diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c
-index e9a7c94..2d057aa 100644
---- a/backends/alpm/pk-backend-packages.c
-+++ b/backends/alpm/pk-backend-packages.c
-@@ -27,13 +27,11 @@
- #include "pk-backend-packages.h"
- 
- gchar *
--alpm_pkg_build_id (pmpkg_t *pkg)
-+alpm_pkg_build_id (alpm_pkg_t *pkg)
- {
- 	const gchar *name, *version, *arch, *repo;
--	pmdb_t *db;
- 
- 	g_return_val_if_fail (pkg != NULL, NULL);
--	g_return_val_if_fail (localdb != NULL, NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	version = alpm_pkg_get_version (pkg);
-@@ -43,19 +41,18 @@ alpm_pkg_build_id (pmpkg_t *pkg)
- 		arch = "any";
- 	}
- 
--	db = alpm_pkg_get_db (pkg);
--	/* TODO: check */
--	if (db == NULL || db == localdb) {
--		repo = "installed";
-+	/* TODO: check correctness */
-+	if (alpm_pkg_get_origin (pkg) == PKG_FROM_SYNCDB) {
-+		repo = alpm_db_get_name (alpm_pkg_get_db (pkg));
- 	} else {
--		repo = alpm_db_get_name (db);
-+		repo = "installed";
- 	}
- 
- 	return pk_package_id_build (name, version, arch, repo);
- }
- 
- void
--pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info)
-+pk_backend_pkg (PkBackend *self, alpm_pkg_t *pkg, PkInfoEnum info)
- {
- 	gchar *package;
- 
-@@ -67,16 +64,17 @@ pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info)
- 	g_free (package);
- }
- 
--pmpkg_t *
-+alpm_pkg_t *
- pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
- {
- 	gchar **package;
- 	const gchar *repo_id;
--	pmdb_t *db = NULL;
--	pmpkg_t *pkg;
-+	alpm_db_t *db = NULL;
-+	alpm_pkg_t *pkg;
- 
- 	g_return_val_if_fail (self != NULL, NULL);
- 	g_return_val_if_fail (package_id != NULL, NULL);
-+	g_return_val_if_fail (alpm != NULL, NULL);
- 	g_return_val_if_fail (localdb != NULL, NULL);
- 
- 	package = pk_package_id_split (package_id);
-@@ -86,8 +84,8 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
- 	if (g_strcmp0 (repo_id, "installed") == 0) {
- 		db = localdb;
- 	} else {
--		const alpm_list_t *i;
--		for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
-+		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
-+		for (; i != NULL; i = i->next) {
- 			const gchar *repo = alpm_db_get_name (i->data);
- 
- 			if (g_strcmp0 (repo, repo_id) == 0) {
-@@ -111,7 +109,7 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
- 	}
- 
- 	if (pkg == NULL) {
--		int code = PM_ERR_PKG_NOT_FOUND;
-+		int code = ALPM_ERR_PKG_NOT_FOUND;
- 		g_set_error (error, ALPM_ERROR, code, "%s: %s", package_id,
- 			     alpm_strerror (code));
- 	}
-@@ -123,7 +121,7 @@ static gboolean
- pk_backend_resolve_package (PkBackend *self, const gchar *package,
- 			    GError **error)
- {
--	pmpkg_t *pkg;
-+	alpm_pkg_t *pkg;
- 	
- 	PkBitfield filters;
- 	gboolean skip_local, skip_remote;
-@@ -142,7 +140,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package,
- 					  PK_FILTER_ENUM_NOT_INSTALLED);
- 	skip_remote = pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED);
- 
--	if (alpm_pkg_get_db (pkg) == localdb) {
-+	if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) {
- 		if (!skip_local) {
- 			pk_backend_pkg (self, pkg, PK_INFO_ENUM_INSTALLED);
- 		}
-@@ -158,7 +156,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package,
- static gboolean
- pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- {
--	pmpkg_t *pkg;
-+	alpm_pkg_t *pkg;
- 	int code;
- 	
- 	PkBitfield filters;
-@@ -166,6 +164,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 	g_return_val_if_fail (name != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	filters = pk_backend_get_uint (self, "filters");
-@@ -180,8 +179,8 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- 			return TRUE;
- 		}
- 	} else if (!skip_remote) {
--		const alpm_list_t *i;
--		for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
-+		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
-+		for (; i != NULL; i = i->next) {
- 			pkg = alpm_db_get_pkg (i->data, name);
- 			if (pkg != NULL) {
- 				pk_backend_pkg (self, pkg,
-@@ -191,7 +190,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
- 		}
- 	}
- 
--	code = PM_ERR_PKG_NOT_FOUND;
-+	code = ALPM_ERR_PKG_NOT_FOUND;
- 	g_set_error (error, ALPM_ERROR, code, "%s: %s", name,
- 		     alpm_strerror (code));
- 	return FALSE;
-@@ -254,7 +253,7 @@ pk_backend_get_details_thread (PkBackend *self)
- 	g_return_val_if_fail (packages != NULL, FALSE);
- 
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
-+		alpm_pkg_t *pkg;
- 		const alpm_list_t *i;
- 
- 		GString *licenses;
-@@ -286,7 +285,7 @@ pk_backend_get_details_thread (PkBackend *self)
- 		desc = alpm_pkg_get_desc (pkg);
- 		url = alpm_pkg_get_url (pkg);
- 
--		if (alpm_pkg_get_db (pkg) == localdb) {
-+		if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) {
- 			size = alpm_pkg_get_isize (pkg);
- 		} else {
- 			size = alpm_pkg_download_size (pkg);
-@@ -317,17 +316,19 @@ pk_backend_get_files_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	packages = pk_backend_get_strv (self, "package_ids");
- 
- 	g_return_val_if_fail (packages != NULL, FALSE);
- 
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg;
--		const alpm_list_t *i;
-+		alpm_pkg_t *pkg;
-+		const gchar *root;
- 
- 		GString *files;
--		const gchar *root;
-+		alpm_filelist_t *filelist;
-+		gsize i;
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
-@@ -338,11 +339,13 @@ pk_backend_get_files_thread (PkBackend *self)
- 			break;
- 		}
- 
-+		root = alpm_option_get_root (alpm);
- 		files = g_string_new ("");
--		root = alpm_option_get_root ();
--		for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) {
--			g_string_append_printf (files, ";%s%s", root,
--						(const gchar *) i->data);
-+
-+		filelist = alpm_pkg_get_files (pkg);
-+		for (i = 0; i < filelist->count; ++i) {
-+			const gchar *file = filelist->files[i].name;
-+			g_string_append_printf (files, ";%s%s", root, file);
- 		}
- 
- 		pk_backend_files (self, *packages, files->str + 1);
-diff --git a/backends/alpm/pk-backend-packages.h b/backends/alpm/pk-backend-packages.h
-index 4b2d7f8..2d54684 100644
---- a/backends/alpm/pk-backend-packages.h
-+++ b/backends/alpm/pk-backend-packages.h
-@@ -24,10 +24,11 @@
- #include <alpm.h>
- #include <pk-backend.h>
- 
--gchar	*alpm_pkg_build_id	(pmpkg_t *pkg);
-+gchar		*alpm_pkg_build_id	(alpm_pkg_t *pkg);
- 
--void	 pk_backend_pkg		(PkBackend *self, pmpkg_t *pkg,
--				 PkInfoEnum info);
-+void		 pk_backend_pkg		(PkBackend *self, alpm_pkg_t *pkg,
-+					 PkInfoEnum info);
- 
--pmpkg_t	*pk_backend_find_pkg	(PkBackend *self, const gchar *package_id,
--				 GError **error);
-+alpm_pkg_t	*pk_backend_find_pkg	(PkBackend *self,
-+					 const gchar *package_id,
-+					 GError **error);
-diff --git a/backends/alpm/pk-backend-remove.c b/backends/alpm/pk-backend-remove.c
-index 03329b1..1993061 100644
---- a/backends/alpm/pk-backend-remove.c
-+++ b/backends/alpm/pk-backend-remove.c
-@@ -29,29 +29,14 @@
- #include "pk-backend-remove.h"
- #include "pk-backend-transaction.h"
- 
--static gint
--alpm_remove_local (const gchar *name)
--{
--	pmpkg_t *pkg;
--
--	g_return_val_if_fail (name != NULL, -1);
--	g_return_val_if_fail (localdb != NULL, -1);
--
--	pkg = alpm_db_get_pkg (localdb, name);
--	if (pkg == NULL) {
--		pm_errno = PM_ERR_PKG_NOT_FOUND;
--		return -1;
--	}
--
--	return alpm_remove_pkg (pkg);
--}
--
- static gboolean
- pk_backend_transaction_remove_targets (PkBackend *self, GError **error)
- {
- 	gchar **packages;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	packages = pk_backend_get_strv (self, "package_ids");
- 
-@@ -61,9 +46,11 @@ pk_backend_transaction_remove_targets (PkBackend *self, GError **error)
- 		gchar **package = pk_package_id_split (*packages);
- 		gchar *name = package[PK_PACKAGE_ID_NAME];
- 
--		if (alpm_remove_local (name) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s",
--				     name, alpm_strerrorlast ());
-+		alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name);
-+		if (pkg == NULL || alpm_remove_pkg (alpm, pkg) < 0) {
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "%s: %s", name,
-+				     alpm_strerror (errno));
- 			g_strfreev (package);
- 			return FALSE;
- 		}
-@@ -79,14 +66,17 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error)
- {
- 	const alpm_list_t *i;
- 
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
- 	if (!pk_backend_transaction_simulate (self, error)) {
- 		return FALSE;
- 	}
- 
--	for (i = alpm_trans_get_remove (); i != NULL; i = i->next) {
-+	for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) {
- 		const gchar *name = alpm_pkg_get_name (i->data);
- 		if (alpm_list_find_str (holdpkgs, name)) {
--			g_set_error (error, ALPM_ERROR, PM_ERR_PKG_HELD,
-+			g_set_error (error, ALPM_ERROR, ALPM_ERR_PKG_HELD,
- 				     "%s: %s", name,
- 				     "could not remove HoldPkg");
- 			return FALSE;
-@@ -99,14 +89,14 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error)
- static gboolean
- pk_backend_simulate_remove_packages_thread (PkBackend *self)
- {
--	pmtransflag_t flags = PM_TRANS_FLAG_CASCADE;
-+	alpm_transflag_t flags = ALPM_TRANS_FLAG_CASCADE;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 
- 	/* remove unneeded packages that were required by those to be removed */
- 	if (pk_backend_get_bool (self, "autoremove")) {
--		flags |= PM_TRANS_FLAG_RECURSE;
-+		flags |= ALPM_TRANS_FLAG_RECURSE;
- 	}
- 
- 	if (pk_backend_transaction_initialize (self, flags, &error) &&
-@@ -121,18 +111,18 @@ pk_backend_simulate_remove_packages_thread (PkBackend *self)
- static gboolean
- pk_backend_remove_packages_thread (PkBackend *self)
- {
--	pmtransflag_t flags = 0;
-+	alpm_transflag_t flags = 0;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 
- 	/* remove packages that depend on those to be removed */
- 	if (pk_backend_get_bool (self, "allow_deps")) {
--		flags |= PM_TRANS_FLAG_CASCADE;
-+		flags |= ALPM_TRANS_FLAG_CASCADE;
- 	}
- 	/* remove unneeded packages that were required by those to be removed */
- 	if (pk_backend_get_bool (self, "autoremove")) {
--		flags |= PM_TRANS_FLAG_RECURSE;
-+		flags |= ALPM_TRANS_FLAG_RECURSE;
- 	}
- 
- 	if (pk_backend_transaction_initialize (self, flags, &error) &&
-diff --git a/backends/alpm/pk-backend-search.c b/backends/alpm/pk-backend-search.c
-index 592472d..c4e80ae 100644
---- a/backends/alpm/pk-backend-search.c
-+++ b/backends/alpm/pk-backend-search.c
-@@ -55,9 +55,10 @@ static gpointer
- pk_backend_pattern_chroot (const gchar *needle, GError **error)
- {
- 	g_return_val_if_fail (needle != NULL, NULL);
-+	g_return_val_if_fail (alpm != NULL, NULL);
- 
- 	if (G_IS_DIR_SEPARATOR (*needle)) {
--		const gchar *file = needle, *root = alpm_option_get_root ();
-+		const gchar *file = needle, *root = alpm_option_get_root (alpm);
- 
- 		/* adjust needle to the correct prefix */
- 		for (; *file == *root; ++file, ++root) {
-@@ -74,7 +75,7 @@ pk_backend_pattern_chroot (const gchar *needle, GError **error)
- }
- 
- static gboolean
--pk_backend_match_all (pmpkg_t *pkg, gpointer pattern)
-+pk_backend_match_all (alpm_pkg_t *pkg, gpointer pattern)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (pattern != NULL, FALSE);
-@@ -84,10 +85,10 @@ pk_backend_match_all (pmpkg_t *pkg, gpointer pattern)
- }
- 
- static gboolean
--pk_backend_match_details (pmpkg_t *pkg, GRegex *regex)
-+pk_backend_match_details (alpm_pkg_t *pkg, GRegex *regex)
- {
- 	const gchar *desc;
--	pmdb_t *db;
-+	alpm_db_t *db;
- 	const alpm_list_t *i;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
-@@ -123,32 +124,38 @@ pk_backend_match_details (pmpkg_t *pkg, GRegex *regex)
- }
- 
- static gboolean
--pk_backend_match_file (pmpkg_t *pkg, const gchar *needle)
-+pk_backend_match_file (alpm_pkg_t *pkg, const gchar *needle)
- {
--	const alpm_list_t *i;
-+	alpm_filelist_t *files;
-+	gsize i;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (needle != NULL, FALSE);
- 
-+	files = alpm_pkg_get_files (pkg);
-+
- 	/* match any file the package contains */
- 	if (G_IS_DIR_SEPARATOR (*needle)) {
--		for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) {
-+		for (i = 0; i < files->count; ++i) {
-+			const gchar *file = files->files[i].name;
- 			/* match the full path of file */
--			if (g_strcmp0 (i->data, needle + 1) == 0) {
-+			if (g_strcmp0 (file, needle + 1) == 0) {
- 				return TRUE;
- 			}
- 		}
- 	} else {
--		for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) {
--			const gchar *file = strrchr (i->data, G_DIR_SEPARATOR);
--			if (file == NULL) {
--				file = i->data;
-+		for (i = 0; i < files->count; ++i) {
-+			const gchar *file = files->files[i].name;
-+			const gchar *name = strrchr (file, G_DIR_SEPARATOR);
-+
-+			if (name == NULL) {
-+				name = file;
- 			} else {
--				++file;
-+				++name;
- 			}
- 
- 			/* match the basename of file */
--			if (g_strcmp0 (file, needle) == 0) {
-+			if (g_strcmp0 (name, needle) == 0) {
- 				return TRUE;
- 			}
- 		}
-@@ -158,7 +165,7 @@ pk_backend_match_file (pmpkg_t *pkg, const gchar *needle)
- }
- 
- static gboolean
--pk_backend_match_group (pmpkg_t *pkg, const gchar *needle)
-+pk_backend_match_group (alpm_pkg_t *pkg, const gchar *needle)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (needle != NULL, FALSE);
-@@ -168,7 +175,7 @@ pk_backend_match_group (pmpkg_t *pkg, const gchar *needle)
- }
- 
- static gboolean
--pk_backend_match_name (pmpkg_t *pkg, GRegex *regex)
-+pk_backend_match_name (alpm_pkg_t *pkg, GRegex *regex)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (regex != NULL, FALSE);
-@@ -178,7 +185,7 @@ pk_backend_match_name (pmpkg_t *pkg, GRegex *regex)
- }
- 
- static gboolean
--pk_backend_match_provides (pmpkg_t *pkg, gpointer pattern)
-+pk_backend_match_provides (alpm_pkg_t *pkg, gpointer pattern)
- {
- 	/* TODO: implement GStreamer codecs, Pango fonts, etc. */
- 	const alpm_list_t *i;
-@@ -215,7 +222,7 @@ typedef enum {
- } SearchType;
- 
- typedef gpointer (*PatternFunc) (const gchar *needle, GError **error);
--typedef gboolean (*MatchFunc) (pmpkg_t *pkg, gpointer pattern);
-+typedef gboolean (*MatchFunc) (alpm_pkg_t *pkg, gpointer pattern);
- 
- static PatternFunc pattern_funcs[] = {
- 	pk_backend_pattern_needle,
-@@ -245,9 +252,9 @@ static MatchFunc match_funcs[] = {
- };
- 
- static gboolean
--alpm_pkg_is_local (pmpkg_t *pkg)
-+alpm_pkg_is_local (alpm_pkg_t *pkg)
- {
--	pmpkg_t *local;
-+	alpm_pkg_t *local;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
-@@ -274,7 +281,7 @@ alpm_pkg_is_local (pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_search_db (PkBackend *self, pmdb_t *db, MatchFunc match,
-+pk_backend_search_db (PkBackend *self, alpm_db_t *db, MatchFunc match,
- 		      const alpm_list_t *patterns)
- {
- 	const alpm_list_t *i, *j;
-@@ -326,6 +333,7 @@ pk_backend_search_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	needles = pk_backend_get_strv (self, "search");
-@@ -366,7 +374,7 @@ pk_backend_search_thread (PkBackend *self)
- 		goto out;
- 	}
- 
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
-+	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
- 		if (pk_backend_cancelled (self)) {
- 			break;
- 		}
-diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c
-index 9e1e02b..c770159 100644
---- a/backends/alpm/pk-backend-sync.c
-+++ b/backends/alpm/pk-backend-sync.c
-@@ -30,41 +30,13 @@
- #include "pk-backend-sync.h"
- #include "pk-backend-transaction.h"
- 
--static gint
--alpm_add_dbtarget (const gchar *repo, const gchar *name)
--{
--	const alpm_list_t *i;
--	pmpkg_t *pkg;
--
--	g_return_val_if_fail (repo != NULL, -1);
--	g_return_val_if_fail (name != NULL, -1);
--
--	for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) {
--		if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) {
--			break;
--		}
--	}
--
--	if (i == NULL) {
--		pm_errno = PM_ERR_DB_NOT_FOUND;
--		return -1;
--	}
--
--	pkg = alpm_db_get_pkg (i->data, name);
--	if (pkg == NULL) {
--		pm_errno = PM_ERR_PKG_NOT_FOUND;
--		return -1;
--	}
--
--	return alpm_add_pkg (pkg);
--}
--
- static gboolean
- pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
- {
- 	gchar **packages;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	packages = pk_backend_get_strv (self, "package_ids");
- 
-@@ -75,9 +47,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
- 		gchar *repo = package[PK_PACKAGE_ID_DATA];
- 		gchar *name = package[PK_PACKAGE_ID_NAME];
- 
--		if (alpm_add_dbtarget (repo, name) < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "%s/%s: %s",
--				     repo, name, alpm_strerrorlast ());
-+		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
-+		alpm_pkg_t *pkg;
-+
-+		for (; i != NULL; i = i->next) {
-+			if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) {
-+				break;
-+			}
-+		}
-+
-+		if (i == NULL) {
-+			enum _alpm_errno_t errno = ALPM_ERR_DB_NOT_FOUND;
-+			g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s",
-+				     repo, name, alpm_strerror (errno));
-+			g_strfreev (package);
-+			return FALSE;
-+		}
-+
-+		pkg = alpm_db_get_pkg (i->data, name);
-+		if (pkg == NULL || alpm_add_pkg (alpm, pkg) < 0) {
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s",
-+				     repo, name, alpm_strerror (errno));
- 			g_strfreev (package);
- 			return FALSE;
- 		}
-@@ -93,23 +84,27 @@ pk_backend_download_packages_thread (PkBackend *self)
- {
- 	alpm_list_t *cachedirs;
- 	const gchar *directory;
--	pmtransflag_t flags = 0;
-+	alpm_transflag_t flags = 0;
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	directory = pk_backend_get_string (self, "directory");
- 
- 	if (directory != NULL) {
- 		/* download files to a PackageKit directory */
- 		gchar *cachedir = strdup (directory);
--		cachedirs = alpm_list_strdup (alpm_option_get_cachedirs ());
--		alpm_option_set_cachedirs (alpm_list_add (NULL, cachedir));
-+		const alpm_list_t *old = alpm_option_get_cachedirs (alpm);
-+		alpm_list_t *new = alpm_list_add (NULL, cachedir);
-+
-+		cachedirs = alpm_list_strdup (old);
-+		alpm_option_set_cachedirs (alpm, new);
- 	}
- 
--	flags |= PM_TRANS_FLAG_NODEPS;
--	flags |= PM_TRANS_FLAG_NOCONFLICTS;
--	flags |= PM_TRANS_FLAG_DOWNLOADONLY;
-+	flags |= ALPM_TRANS_FLAG_NODEPS;
-+	flags |= ALPM_TRANS_FLAG_NOCONFLICTS;
-+	flags |= ALPM_TRANS_FLAG_DOWNLOADONLY;
- 
- 	if (pk_backend_transaction_initialize (self, flags, &error) &&
- 	    pk_backend_transaction_sync_targets (self, &error) &&
-@@ -118,7 +113,7 @@ pk_backend_download_packages_thread (PkBackend *self)
- 	}
- 
- 	if (directory != NULL) {
--		alpm_option_set_cachedirs (cachedirs);
-+		alpm_option_set_cachedirs (alpm, cachedirs);
- 	}
- 
- 	return pk_backend_transaction_finish (self, error);
-@@ -190,16 +185,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted,
- }
- 
- static gboolean
--pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_replaces_dependencies (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	const alpm_list_t *i, *replaces;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
- 	g_return_val_if_fail (pkg != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	replaces = alpm_pkg_get_replaces (pkg);
--	for (i = alpm_trans_get_remove (); i != NULL; i = i->next) {
--		pmpkg_t *rpkg = (pmpkg_t *) i->data;
-+	for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) {
-+		alpm_pkg_t *rpkg = (alpm_pkg_t *) i->data;
- 		const gchar *rname = alpm_pkg_get_name (rpkg);
- 
- 		if (pk_backend_cancelled (self)) {
-@@ -208,7 +204,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg)
- 			continue;
- 		}
- 
--		if (alpm_pkg_get_reason (rpkg) == PM_PKG_REASON_EXPLICIT) {
-+		if (alpm_pkg_get_reason (rpkg) == ALPM_PKG_REASON_EXPLICIT) {
- 			return FALSE;
- 		}
- 	}
-@@ -224,6 +220,7 @@ pk_backend_update_packages_thread (PkBackend *self)
- 	GError *error = NULL;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	if (!pk_backend_transaction_initialize (self, 0, &error) ||
-@@ -233,8 +230,8 @@ pk_backend_update_packages_thread (PkBackend *self)
- 	}
- 
- 	/* change the install reason of packages that replace dependencies */
--	for (i = alpm_trans_get_add (); i != NULL; i = i->next) {
--		pmpkg_t *pkg = (pmpkg_t *) i->data;
-+	for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) {
-+		alpm_pkg_t *pkg = (alpm_pkg_t *) i->data;
- 		const gchar *name = alpm_pkg_get_name (pkg);
- 
- 		if (pk_backend_cancelled (self)) {
-@@ -254,7 +251,8 @@ pk_backend_update_packages_thread (PkBackend *self)
- 
- 	for (i = asdeps; i != NULL; i = i->next) {
- 		const gchar *name = (const gchar *) i->data;
--		alpm_db_set_pkgreason (localdb, name, PM_PKG_REASON_DEPEND);
-+		alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name);
-+		alpm_db_set_pkgreason (alpm, pkg, ALPM_PKG_REASON_DEPEND);
- 	}
- 
- out:
-diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c
-index fdb840e..f812766 100644
---- a/backends/alpm/pk-backend-transaction.c
-+++ b/backends/alpm/pk-backend-transaction.c
-@@ -29,10 +29,10 @@
- static off_t dcomplete = 0;
- static off_t dtotal = 0;
- 
--static pmpkg_t *dpkg = NULL;
-+static alpm_pkg_t *dpkg = NULL;
- static GString *dfiles = NULL;
- 
--static pmpkg_t *tpkg = NULL;
-+static alpm_pkg_t *tpkg = NULL;
- static GString *toutput = NULL;
- 
- static gchar *
-@@ -51,25 +51,26 @@ pk_backend_resolve_path (PkBackend *self, const gchar *basename)
- }
- 
- static gboolean
--alpm_pkg_has_basename (pmpkg_t *pkg, const gchar *basename)
-+alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename)
- {
- 	const alpm_list_t *i;
- 
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 	g_return_val_if_fail (basename != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	if (g_strcmp0 (alpm_pkg_get_filename (pkg), basename) == 0) {
- 		return TRUE;
- 	}
- 
--	if (alpm_option_get_usedelta () == 0) {
-+	if (alpm_option_get_usedelta (alpm) == 0) {
- 		return FALSE;
- 	}
- 
- 	for (i = alpm_pkg_get_deltas (pkg); i != NULL; i = i->next) {
--		const gchar *patch = alpm_delta_get_filename (i->data);
-+		alpm_delta_t *delta = (alpm_delta_t *) i->data;
- 
--		if (g_strcmp0 (patch, basename) == 0) {
-+		if (g_strcmp0 (delta->delta, basename) == 0) {
- 			return TRUE;
- 		}
- 	}
-@@ -109,6 +110,7 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename)
- 
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (basename != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	/* continue or finish downloading the current package */
- 	if (dpkg != NULL) {
-@@ -127,8 +129,8 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename)
- 	}
- 
- 	/* figure out what the next package is */
--	for (i = alpm_trans_get_add (); i != NULL; i = i->next) {
--		pmpkg_t *pkg = (pmpkg_t *) i->data;
-+	for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) {
-+		alpm_pkg_t *pkg = (alpm_pkg_t *) i->data;
- 
- 		if (alpm_pkg_has_basename (pkg, basename)) {
- 			dpkg = pkg;
-@@ -202,16 +204,17 @@ pk_backend_transaction_dlcb (const gchar *basename, off_t complete, off_t total)
- }
- 
- static void
--pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target,
-+pk_backend_transaction_progress_cb (alpm_progress_t type, const gchar *target,
- 				    gint percent, gsize targets, gsize current)
- {
- 	static gint recent = 101;
- 	gsize overall = percent + (current - 1) * 100;
- 
- 	/* TODO: revert when fixed upstream */
--	if (type == PM_TRANS_PROGRESS_CONFLICTS_START ||
--	    type == PM_TRANS_PROGRESS_DISKSPACE_START ||
--	    type == PM_TRANS_PROGRESS_INTEGRITY_START) {
-+	if (type == ALPM_PROGRESS_CONFLICTS_START ||
-+	    type == ALPM_PROGRESS_DISKSPACE_START ||
-+	    type == ALPM_PROGRESS_INTEGRITY_START ||
-+	    type == ALPM_PROGRESS_LOAD_START) {
- 		if (current < targets) {
- 			overall = percent + current++ * 100;
- 		}
-@@ -228,12 +231,13 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target,
- 
- 	/* update transaction progress */
- 	switch (type) {
--		case PM_TRANS_PROGRESS_ADD_START:
--		case PM_TRANS_PROGRESS_UPGRADE_START:
--		case PM_TRANS_PROGRESS_REMOVE_START:
--		case PM_TRANS_PROGRESS_CONFLICTS_START:
--		case PM_TRANS_PROGRESS_DISKSPACE_START:
--		case PM_TRANS_PROGRESS_INTEGRITY_START:
-+		case ALPM_PROGRESS_ADD_START:
-+		case ALPM_PROGRESS_UPGRADE_START:
-+		case ALPM_PROGRESS_REMOVE_START:
-+		case ALPM_PROGRESS_CONFLICTS_START:
-+		case ALPM_PROGRESS_DISKSPACE_START:
-+		case ALPM_PROGRESS_INTEGRITY_START:
-+		case ALPM_PROGRESS_LOAD_START:
- 			if (percent == recent) {
- 				break;
- 			}
-@@ -253,7 +257,7 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target,
- }
- 
- static void
--pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result)
-+pk_backend_install_ignorepkg (PkBackend *self, alpm_pkg_t *pkg, gint *result)
- {
- 	gchar *output;
- 
-@@ -280,50 +284,52 @@ pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result)
- }
- 
- static void
--pk_backend_select_provider (PkBackend *self, pmdepend_t *dep,
-+pk_backend_select_provider (PkBackend *self, alpm_depend_t *depend,
- 			    const alpm_list_t *providers)
- {
- 	gchar *output;
- 
- 	g_return_if_fail (self != NULL);
--	g_return_if_fail (dep != NULL);
-+	g_return_if_fail (depend != NULL);
- 	g_return_if_fail (providers != NULL);
- 
- 	output = g_strdup_printf ("provider package was selected "
- 				  "(%s provides %s)\n",
- 				  alpm_pkg_get_name (providers->data),
--				  alpm_dep_get_name (dep));
-+				  depend->name);
- 	pk_backend_output (self, output);
- 	g_free (output);
- }
- 
- static void
--pk_backend_transaction_conv_cb (pmtransconv_t question, gpointer data1,
-+pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1,
- 				gpointer data2, gpointer data3, gint *result)
- {
- 	g_return_if_fail (result != NULL);
- 	g_return_if_fail (backend != NULL);
- 
- 	switch (question) {
--		case PM_TRANS_CONV_INSTALL_IGNOREPKG:
-+		case ALPM_QUESTION_INSTALL_IGNOREPKG:
- 			pk_backend_install_ignorepkg (backend, data1, result);
- 			break;
- 
--		case PM_TRANS_CONV_REPLACE_PKG:
--		case PM_TRANS_CONV_CONFLICT_PKG:
--		case PM_TRANS_CONV_CORRUPTED_PKG:
--		case PM_TRANS_CONV_LOCAL_NEWER:
-+		case ALPM_QUESTION_REPLACE_PKG:
-+		case ALPM_QUESTION_CONFLICT_PKG:
-+		case ALPM_QUESTION_CORRUPTED_PKG:
-+		case ALPM_QUESTION_LOCAL_NEWER:
- 			/* these actions are mostly harmless */
- 			g_debug ("safe question %d", question);
- 			*result = 1;
- 			break;
- 
--		case PM_TRANS_CONV_REMOVE_PKGS:
-+		case ALPM_QUESTION_REMOVE_PKGS:
-+		/* TODO: handle keys better */
-+		case ALPM_QUESTION_IMPORT_KEY:
- 			g_debug ("unsafe question %d", question);
- 			*result = 0;
- 			break;
- 
--		case PM_TRANS_CONV_SELECT_PROVIDER:
-+		case ALPM_QUESTION_SELECT_PROVIDER:
- 			pk_backend_select_provider (backend, data1, data2);
- 			*result = 0;
- 			break;
-@@ -349,7 +355,7 @@ pk_backend_output_end (PkBackend *self)
- }
- 
- static void
--pk_backend_output_start (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_output_start (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-@@ -398,7 +404,7 @@ pk_backend_transaction_test_commit (PkBackend *self)
- }
- 
- static void
--pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_add_start (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-@@ -409,18 +415,19 @@ pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	const gchar *name, *version;
- 	const alpm_list_t *i, *optdepends;
- 
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	version = alpm_pkg_get_version (pkg);
- 
--	alpm_logaction ("installed %s (%s)\n", name, version);
-+	alpm_logaction (alpm, "installed %s (%s)\n", name, version);
- 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
- 
- 	optdepends = alpm_pkg_get_optdepends (pkg);
-@@ -438,7 +445,7 @@ pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_remove_start (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-@@ -449,24 +456,25 @@ pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg)
- }
- 
- static void
--pk_backend_transaction_remove_done (PkBackend *self, pmpkg_t *pkg)
-+pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg)
- {
- 	const gchar *name, *version;
- 
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	version = alpm_pkg_get_version (pkg);
- 
--	alpm_logaction ("removed %s (%s)\n", name, version);
-+	alpm_logaction (alpm, "removed %s (%s)\n", name, version);
- 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
- 	pk_backend_output_end (self);
- }
- 
- static void
--pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg,
--				      pmpkg_t *old)
-+pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg,
-+				      alpm_pkg_t *old)
- {
- 	PkRoleEnum role;
- 	PkStatusEnum state;
-@@ -491,8 +499,8 @@ pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg,
- }
- 
- static void
--pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg,
--				     pmpkg_t *old)
-+pk_backend_transaction_upgrade_done (PkBackend *self, alpm_pkg_t *pkg,
-+				     alpm_pkg_t *old)
- {
- 	const gchar *name, *pre, *post;
- 	const alpm_list_t *i;
-@@ -501,12 +509,13 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg,
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (pkg != NULL);
- 	g_return_if_fail (old != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
- 	name = alpm_pkg_get_name (pkg);
- 	pre = alpm_pkg_get_version (old);
- 	post = alpm_pkg_get_version (pkg);
- 
--	alpm_logaction ("upgraded %s (%s -> %s)\n", name, pre, post);
-+	alpm_logaction (alpm, "upgraded %s (%s -> %s)\n", name, pre, post);
- 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
- 
- 	optdepends = alpm_list_diff (alpm_pkg_get_optdepends (pkg),
-@@ -528,53 +537,65 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg,
- }
- 
- static void
--pk_backend_transaction_event_cb (pmtransevt_t event, gpointer data,
-+pk_backend_transaction_setup (PkBackend *self)
-+{
-+	g_return_if_fail (self != NULL);
-+
-+	pk_backend_set_status (self, PK_STATUS_ENUM_SETUP);
-+}
-+
-+static void
-+pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
- 				 gpointer old)
- {
- 	g_return_if_fail (backend != NULL);
- 
- 	/* figure out the backend status and package info */
- 	switch (event) {
--		case PM_TRANS_EVT_CHECKDEPS_START:
--		case PM_TRANS_EVT_RESOLVEDEPS_START:
-+		case ALPM_EVENT_CHECKDEPS_START:
-+		case ALPM_EVENT_RESOLVEDEPS_START:
- 			pk_backend_transaction_dep_resolve (backend);
- 			break;
- 
--		case PM_TRANS_EVT_FILECONFLICTS_START:
--		case PM_TRANS_EVT_INTERCONFLICTS_START:
--		case PM_TRANS_EVT_INTEGRITY_START:
--		case PM_TRANS_EVT_DELTA_INTEGRITY_START:
--		case PM_TRANS_EVT_DISKSPACE_START:
-+		case ALPM_EVENT_FILECONFLICTS_START:
-+		case ALPM_EVENT_INTERCONFLICTS_START:
-+		case ALPM_EVENT_INTEGRITY_START:
-+		case ALPM_EVENT_DELTA_INTEGRITY_START:
-+		case ALPM_EVENT_DISKSPACE_START:
- 			pk_backend_transaction_test_commit (backend);
- 			break;
- 
--		case PM_TRANS_EVT_ADD_START:
-+		case ALPM_EVENT_ADD_START:
- 			pk_backend_transaction_add_start (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_ADD_DONE:
-+		case ALPM_EVENT_ADD_DONE:
- 			pk_backend_transaction_add_done (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_REMOVE_START:
-+		case ALPM_EVENT_REMOVE_START:
- 			pk_backend_transaction_remove_start (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_REMOVE_DONE:
-+		case ALPM_EVENT_REMOVE_DONE:
- 			pk_backend_transaction_remove_done (backend, data);
- 			break;
- 
--		case PM_TRANS_EVT_UPGRADE_START:
-+		case ALPM_EVENT_UPGRADE_START:
- 			pk_backend_transaction_upgrade_start (backend, data,
- 							      old);
- 			break;
- 
--		case PM_TRANS_EVT_UPGRADE_DONE:
-+		case ALPM_EVENT_UPGRADE_DONE:
- 			pk_backend_transaction_upgrade_done (backend, data,
- 							     old);
- 			break;
- 
--		case PM_TRANS_EVT_SCRIPTLET_INFO:
-+		case ALPM_EVENT_LOAD_START:
-+			pk_backend_transaction_setup (backend);
-+			break;
-+
-+		case ALPM_EVENT_SCRIPTLET_INFO:
- 			pk_backend_output (backend, data);
- 			break;
- 
-@@ -588,27 +609,32 @@ static void
- transaction_cancelled_cb (GCancellable *object, gpointer data)
- {
- 	g_return_if_fail (data != NULL);
-+	g_return_if_fail (alpm != NULL);
- 
--	alpm_trans_interrupt ();
-+	alpm_trans_interrupt (alpm);
- }
- 
- gboolean
--pk_backend_transaction_initialize (PkBackend *self, pmtransflag_t flags,
-+pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags,
- 				   GError **error)
- {
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (cancellable != NULL, FALSE);
- 
--	if (alpm_trans_init (flags, pk_backend_transaction_event_cb,
--			     pk_backend_transaction_conv_cb,
--			     pk_backend_transaction_progress_cb) < 0) {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+	if (alpm_trans_init (alpm, flags) < 0) {
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 		return FALSE;
- 	}
- 
--	alpm_option_set_dlcb (pk_backend_transaction_dlcb);
--	alpm_option_set_totaldlcb (pk_backend_transaction_totaldlcb);
-+	alpm_option_set_eventcb (alpm, pk_backend_transaction_event_cb);
-+	alpm_option_set_questioncb (alpm, pk_backend_transaction_conv_cb);
-+	alpm_option_set_progresscb (alpm, pk_backend_transaction_progress_cb);
-+
-+	alpm_option_set_dlcb (alpm, pk_backend_transaction_dlcb);
-+	alpm_option_set_totaldlcb (alpm, pk_backend_transaction_totaldlcb);
- 
- 	g_cancellable_connect (cancellable,
- 			       G_CALLBACK (transaction_cancelled_cb),
-@@ -649,10 +675,11 @@ alpm_miss_build_list (const alpm_list_t *i)
- 	}
- 
- 	for (; i != NULL; i = i->next) {
--		pmdepend_t *dep = alpm_miss_get_dep (i->data);
--		gchar *depend = alpm_dep_compute_string (dep);
-+		alpm_depmissing_t *miss = (alpm_depmissing_t *) i->data;
-+		gchar *depend = alpm_dep_compute_string (miss->depend);
-+
- 		g_string_append_printf (list, "%s <- %s, ", depend,
--					alpm_miss_get_target (i->data));
-+					miss->target);
- 		free (depend);
- 	}
- 
-@@ -661,25 +688,21 @@ alpm_miss_build_list (const alpm_list_t *i)
- }
- 
- static void
--alpm_dep_free (gpointer dep)
-+alpm_depend_free (alpm_depend_t *depend)
- {
--	/* TODO: remove when implemented in libalpm */
--	free ((gpointer) alpm_dep_get_name (dep));
--	free ((gpointer) alpm_dep_get_version (dep));
--	free (dep);
-+	free (depend->name);
-+	free (depend->version);
-+	free (depend);
- }
- 
- static void
--alpm_miss_free (gpointer miss)
-+alpm_depmissing_free (gpointer miss)
- {
--	/* TODO: remove when implemented in libalpm */
--	const gchar *temp = alpm_miss_get_causingpkg (miss);
--	if (temp != NULL) {
--		free ((gpointer) temp);
--	}
-+	alpm_depmissing_t *self = (alpm_depmissing_t *) miss;
- 
--	free ((gpointer) alpm_miss_get_target (miss));
--	alpm_dep_free (alpm_miss_get_dep (miss));
-+	free (self->target);
-+	alpm_depend_free (self->depend);
-+	free (self->causingpkg);
- 	free (miss);
- }
- 
-@@ -695,17 +718,20 @@ alpm_conflict_build_list (const alpm_list_t *i)
- 	}
- 
- 	for (; i != NULL; i = i->next) {
--		const gchar *first = alpm_conflict_get_package1 (i->data);
--		const gchar *second = alpm_conflict_get_package2 (i->data);
--		const gchar *reason = alpm_conflict_get_reason (i->data);
-+		alpm_conflict_t *conflict = (alpm_conflict_t *) i->data;
-+		alpm_depend_t *depend = conflict->reason;
- 
--		if (g_strcmp0 (first, reason) == 0 ||
--		    g_strcmp0 (second, reason) == 0) {
--			g_string_append_printf (list, "%s <-> %s, ", first,
--						second);
-+		if (g_strcmp0 (conflict->package1, depend->name) == 0 ||
-+		    g_strcmp0 (conflict->package2, depend->name) == 0) {
-+			g_string_append_printf (list, "%s <-> %s, ",
-+						conflict->package1,
-+						conflict->package2);
- 		} else {
--			g_string_append_printf (list, "%s <-> %s (%s), ", first,
--						second, reason);
-+			gchar *reason = alpm_dep_compute_string (depend);
-+			g_string_append_printf (list, "%s <-> %s (%s), ",
-+						conflict->package1,
-+						conflict->package2, reason);
-+			g_free (reason);
- 		}
- 	}
- 
-@@ -716,10 +742,10 @@ alpm_conflict_build_list (const alpm_list_t *i)
- static void
- alpm_conflict_free (gpointer conflict)
- {
--	/* TODO: remove when implemented in libalpm */
--	free ((gpointer) alpm_conflict_get_package1 (conflict));
--	free ((gpointer) alpm_conflict_get_package2 (conflict));
--	free ((gpointer) alpm_conflict_get_reason (conflict));
-+	alpm_conflict_t *self = (alpm_conflict_t *) conflict;
-+
-+	free (self->package1);
-+	free (self->package2);
- 	free (conflict);
- }
- 
-@@ -735,15 +761,17 @@ alpm_fileconflict_build_list (const alpm_list_t *i)
- 	}
- 
- 	for (; i != NULL; i = i->next) {
--		const gchar *target = alpm_fileconflict_get_target (i->data);
--		const gchar *file = alpm_fileconflict_get_file (i->data);
--		const gchar *ctarget = alpm_fileconflict_get_ctarget (i->data);
--		if (*ctarget != '\0') {
-+		alpm_fileconflict_t *conflict = (alpm_fileconflict_t *) i->data;
-+
-+		if (*conflict->ctarget != '\0') {
- 			g_string_append_printf (list, "%s <-> %s (%s), ",
--						target, ctarget, file);
-+						conflict->target,
-+						conflict->ctarget,
-+						conflict->file);
- 		} else {
--			g_string_append_printf (list, "%s (%s), ", target,
--						file);
-+			g_string_append_printf (list, "%s (%s), ",
-+						conflict->target,
-+						conflict->file);
- 		}
- 	}
- 
-@@ -754,14 +782,11 @@ alpm_fileconflict_build_list (const alpm_list_t *i)
- static void
- alpm_fileconflict_free (gpointer conflict)
- {
--	/* TODO: remove when implemented in libalpm */
--	const gchar *temp = alpm_fileconflict_get_ctarget (conflict);
--	if (*temp != '\0') {
--		free ((gpointer) temp);
--	}
-+	alpm_fileconflict_t *self = (alpm_fileconflict_t *) conflict;
- 
--	free ((gpointer) alpm_fileconflict_get_target (conflict));
--	free ((gpointer) alpm_fileconflict_get_file (conflict));
-+	free (self->target);
-+	free (self->file);
-+	free (self->ctarget);
- 	free (conflict);
- }
- 
-@@ -771,29 +796,32 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
- 	alpm_list_t *data = NULL;
- 	gchar *prefix;
- 
--	if (alpm_trans_prepare (&data) >= 0) {
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
-+	if (alpm_trans_prepare (alpm, &data) >= 0) {
- 		return TRUE;
- 	}
- 
--	switch (pm_errno) {
--		case PM_ERR_PKG_INVALID_ARCH:
-+	switch (alpm_errno (alpm)) {
-+		case ALPM_ERR_PKG_INVALID_ARCH:
- 			prefix = alpm_pkg_build_list (data);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_UNSATISFIED_DEPS:
-+		case ALPM_ERR_UNSATISFIED_DEPS:
- 			prefix = alpm_miss_build_list (data);
--			alpm_list_free_inner (data, alpm_miss_free);
-+			alpm_list_free_inner (data, alpm_depmissing_free);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_CONFLICTING_DEPS:
-+		case ALPM_ERR_CONFLICTING_DEPS:
- 			prefix = alpm_conflict_build_list (data);
- 			alpm_list_free_inner (data, alpm_conflict_free);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_FILE_CONFLICTS:
-+		case ALPM_ERR_FILE_CONFLICTS:
- 			prefix = alpm_fileconflict_build_list (data);
- 			alpm_list_free_inner (data, alpm_fileconflict_free);
- 			alpm_list_free (data);
-@@ -802,18 +830,21 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
- 		default:
- 			prefix = NULL;
- 			if (data != NULL) {
--				g_warning ("unhandled error %d", pm_errno);
-+				g_warning ("unhandled error %d",
-+					   alpm_errno (alpm));
- 			}
- 			break;
- 	}
- 
- 	if (prefix != NULL) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix,
--			     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix,
-+			     alpm_strerror (errno));
- 		g_free (prefix);
- 	} else {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 	}
- 
- 	return FALSE;
-@@ -826,10 +857,11 @@ pk_backend_transaction_packages (PkBackend *self)
- 	PkInfoEnum info;
- 
- 	g_return_if_fail (self != NULL);
-+	g_return_if_fail (alpm != NULL);
- 	g_return_if_fail (localdb != NULL);
- 
- 	/* emit packages that would have been installed */
--	for (i = alpm_trans_get_add (); i != NULL; i = i->next) {
-+	for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) {
- 		if (pk_backend_cancelled (self)) {
- 			break;
- 		} else {
-@@ -856,7 +888,7 @@ pk_backend_transaction_packages (PkBackend *self)
- 	}
- 
- 	/* emit packages that would have been removed */
--	for (i = alpm_trans_get_remove (); i != NULL; i = i->next) {
-+	for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) {
- 		if (pk_backend_cancelled (self)) {
- 			break;
- 		} else {
-@@ -890,6 +922,9 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
- 	alpm_list_t *data = NULL;
- 	gchar *prefix;
- 
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
- 	if (pk_backend_cancelled (self)) {
- 		return TRUE;
- 	}
-@@ -897,19 +932,19 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
- 	pk_backend_set_allow_cancel (self, FALSE);
- 	pk_backend_set_status (self, PK_STATUS_ENUM_RUNNING);
- 
--	if (alpm_trans_commit (&data) >= 0) {
-+	if (alpm_trans_commit (alpm, &data) >= 0) {
- 		return TRUE;
- 	}
- 
--	switch (pm_errno) {
--		case PM_ERR_FILE_CONFLICTS:
-+	switch (alpm_errno (alpm)) {
-+		case ALPM_ERR_FILE_CONFLICTS:
- 			prefix = alpm_fileconflict_build_list (data);
- 			alpm_list_free_inner (data, alpm_fileconflict_free);
- 			alpm_list_free (data);
- 			break;
- 
--		case PM_ERR_PKG_INVALID:
--		case PM_ERR_DLT_INVALID:
-+		case ALPM_ERR_PKG_INVALID:
-+		case ALPM_ERR_DLT_INVALID:
- 			prefix = alpm_string_build_list (data);
- 			alpm_list_free (data);
- 			break;
-@@ -917,18 +952,21 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
- 		default:
- 			prefix = NULL;
- 			if (data != NULL) {
--				g_warning ("unhandled error %d", pm_errno);
-+				g_warning ("unhandled error %d",
-+					   alpm_errno (alpm));
- 			}
- 			break;
- 	}
- 
- 	if (prefix != NULL) {
--		g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix,
--			     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix,
-+			     alpm_strerror (errno));
- 		g_free (prefix);
- 	} else {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 	}
- 
- 	return FALSE;
-@@ -938,9 +976,14 @@ gboolean
- pk_backend_transaction_end (PkBackend *self, GError **error)
- {
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
-+
-+	alpm_option_set_eventcb (alpm, NULL);
-+	alpm_option_set_questioncb (alpm, NULL);
-+	alpm_option_set_progresscb (alpm, NULL);
- 
--	alpm_option_set_dlcb (NULL);
--	alpm_option_set_totaldlcb (NULL);
-+	alpm_option_set_dlcb (alpm, NULL);
-+	alpm_option_set_totaldlcb (alpm, NULL);
- 
- 	if (dpkg != NULL) {
- 		pk_backend_transaction_download_end (self);
-@@ -949,9 +992,10 @@ pk_backend_transaction_end (PkBackend *self, GError **error)
- 		pk_backend_output_end (self);
- 	}
- 
--	if (alpm_trans_release () < 0) {
--		g_set_error_literal (error, ALPM_ERROR, pm_errno,
--				     alpm_strerrorlast ());
-+	if (alpm_trans_release (alpm) < 0) {
-+		enum _alpm_errno_t errno = alpm_errno (alpm);
-+		g_set_error_literal (error, ALPM_ERROR, errno,
-+				     alpm_strerror (errno));
- 		return FALSE;
- 	}
- 
-diff --git a/backends/alpm/pk-backend-transaction.h b/backends/alpm/pk-backend-transaction.h
-index 6bb1d69..e3733d6 100644
---- a/backends/alpm/pk-backend-transaction.h
-+++ b/backends/alpm/pk-backend-transaction.h
-@@ -25,7 +25,7 @@
- #include <pk-backend.h>
- 
- gboolean	 pk_backend_transaction_initialize	(PkBackend *self,
--							 pmtransflag_t flags,
-+							 alpm_transflag_t flags,
- 							 GError **error);
- 
- gboolean	 pk_backend_transaction_simulate	(PkBackend *self,
-diff --git a/backends/alpm/pk-backend-update.c b/backends/alpm/pk-backend-update.c
-index a281953..37ade1e 100644
---- a/backends/alpm/pk-backend-update.c
-+++ b/backends/alpm/pk-backend-update.c
-@@ -34,7 +34,7 @@
- #include "pk-backend-update.h"
- 
- static gchar *
--alpm_pkg_build_replaces (pmpkg_t *pkg)
-+alpm_pkg_build_replaces (alpm_pkg_t *pkg)
- {
- 	const alpm_list_t *i;
- 	GString *string = NULL;
-@@ -44,7 +44,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg)
- 
- 	/* make a list of the packages that package replaces */
- 	for (i = alpm_pkg_get_replaces (pkg); i != NULL; i = i->next) {
--		pmpkg_t *replaces = alpm_db_get_pkg (localdb, i->data);
-+		alpm_pkg_t *replaces = alpm_db_get_pkg (localdb, i->data);
- 
- 		if (replaces != NULL) {
- 			gchar *package = alpm_pkg_build_id (replaces);
-@@ -65,7 +65,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg)
- }
- 
- static gchar *
--alpm_pkg_build_urls (pmpkg_t *pkg)
-+alpm_pkg_build_urls (alpm_pkg_t *pkg)
- {
- 	GString *string = g_string_new ("");
- #ifdef ALPM_PACKAGE_URL
-@@ -97,7 +97,7 @@ alpm_pkg_build_urls (pmpkg_t *pkg)
- }
- 
- static gboolean
--alpm_pkg_same_pkgver (pmpkg_t *a, pmpkg_t *b)
-+alpm_pkg_same_pkgver (alpm_pkg_t *a, alpm_pkg_t *b)
- {
- 	const gchar *version_a, *version_b, *last_a, *last_b;
- 	gsize length_a, length_b;
-@@ -145,8 +145,8 @@ pk_backend_get_update_detail_thread (PkBackend *self)
- 
- 	/* collect details about updates */
- 	for (; *packages != NULL; ++packages) {
--		pmpkg_t *pkg, *old;
--		pmdb_t *db;
-+		alpm_pkg_t *pkg, *old;
-+		alpm_db_t *db;
- 
- 		gchar *upgrades, *replaces, *urls;
- 		const gchar *reason;
-@@ -245,18 +245,19 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
- 	const alpm_list_t *i;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 
- 	if (!pk_backend_transaction_initialize (self, 0, error)) {
- 		return FALSE;
- 	}
- 
--	alpm_logaction ("synchronizing package lists\n");
-+	alpm_logaction (alpm, "synchronizing package lists\n");
- 
--	dlcb = alpm_option_get_dlcb ();
--	totaldlcb = alpm_option_get_totaldlcb ();
-+	dlcb = alpm_option_get_dlcb (alpm);
-+	totaldlcb = alpm_option_get_totaldlcb (alpm);
- 
- 	/* set total size to minus the number of databases */
--	i = alpm_option_get_syncdbs ();
-+	i = alpm_option_get_syncdbs (alpm);
- 	totaldlcb (-alpm_list_count (i));
- 
- 	for (; i != NULL; i = i->next) {
-@@ -274,9 +275,10 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
- 			/* fake the download when already up to date */
- 			dlcb ("", 1, 1);
- 		} else if (result < 0) {
--			g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s",
-+			enum _alpm_errno_t errno = alpm_errno (alpm);
-+			g_set_error (error, ALPM_ERROR, errno, "[%s]: %s",
- 				     alpm_db_get_name (i->data),
--				     alpm_strerrorlast ());
-+				     alpm_strerror (errno));
- 			break;
- 		}
- 	}
-@@ -292,20 +294,21 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
- }
- 
- static gboolean
--alpm_pkg_is_ignorepkg (pmpkg_t *pkg)
-+alpm_pkg_is_ignorepkg (alpm_pkg_t *pkg)
- {
--	const alpm_list_t *ignorepkgs, *ignoregrps, *i;
-+	const alpm_list_t *ignorepkgs, *ignoregroups, *i;
- 
- 	g_return_val_if_fail (pkg != NULL, TRUE);
-+	g_return_val_if_fail (alpm != NULL, TRUE);
- 
--	ignorepkgs = alpm_option_get_ignorepkgs ();
-+	ignorepkgs = alpm_option_get_ignorepkgs (alpm);
- 	if (alpm_list_find_str (ignorepkgs, alpm_pkg_get_name (pkg)) != NULL) {
- 		return TRUE;
- 	}
- 
--	ignoregrps = alpm_option_get_ignoregrps ();
-+	ignoregroups = alpm_option_get_ignoregroups (alpm);
- 	for (i = alpm_pkg_get_groups (pkg); i != NULL; i = i->next) {
--		if (alpm_list_find_str (ignoregrps, i->data) != NULL) {
-+		if (alpm_list_find_str (ignoregroups, i->data) != NULL) {
- 			return TRUE;
- 		}
- 	}
-@@ -314,7 +317,7 @@ alpm_pkg_is_ignorepkg (pmpkg_t *pkg)
- }
- 
- static gboolean
--alpm_pkg_is_syncfirst (pmpkg_t *pkg)
-+alpm_pkg_is_syncfirst (alpm_pkg_t *pkg)
- {
- 	g_return_val_if_fail (pkg != NULL, FALSE);
- 
-@@ -325,8 +328,18 @@ alpm_pkg_is_syncfirst (pmpkg_t *pkg)
- 	return FALSE;
- }
- 
--static pmpkg_t *
--alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs)
-+static gboolean
-+alpm_pkg_replaces (alpm_pkg_t *pkg, const gchar *name)
-+{
-+	g_return_val_if_fail (pkg != NULL, FALSE);
-+	g_return_val_if_fail (name != NULL, FALSE);
-+
-+	return alpm_list_find_str (alpm_pkg_get_replaces (pkg), name) != NULL;
-+}
-+
-+
-+static alpm_pkg_t *
-+alpm_pkg_find_update (alpm_pkg_t *pkg, const alpm_list_t *dbs)
- {
- 	const gchar *name;
- 	const alpm_list_t *i;
-@@ -336,7 +349,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs)
- 	name = alpm_pkg_get_name (pkg);
- 
- 	for (; dbs != NULL; dbs = dbs->next) {
--		pmpkg_t *update = alpm_db_get_pkg (dbs->data, name);
-+		alpm_pkg_t *update = alpm_db_get_pkg (dbs->data, name);
- 
- 		if (update != NULL) {
- 			if (alpm_pkg_vercmp (alpm_pkg_get_version (update),
-@@ -349,8 +362,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs)
- 
- 		i = alpm_db_get_pkgcache (dbs->data);
- 		for (; i != NULL; i = i->next) {
--			if (alpm_list_find_str (alpm_pkg_get_replaces (i->data),
--						name) != NULL) {
-+			if (alpm_pkg_replaces (i->data, name)) {
- 				return i->data;
- 			}
- 		}
-@@ -367,6 +379,7 @@ pk_backend_get_updates_thread (PkBackend *self)
- 	const alpm_list_t *i, *syncdbs;
- 
- 	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (alpm != NULL, FALSE);
- 	g_return_val_if_fail (localdb != NULL, FALSE);
- 
- 	time (&one_hour_ago);
-@@ -385,9 +398,9 @@ pk_backend_get_updates_thread (PkBackend *self)
- 	}
- 
- 	/* find outdated and replacement packages */
--	syncdbs = alpm_option_get_syncdbs ();
-+	syncdbs = alpm_option_get_syncdbs (alpm);
- 	for (i = alpm_db_get_pkgcache (localdb); i != NULL; i = i->next) {
--		pmpkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
-+		alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
- 
- 		if (pk_backend_cancelled (self)) {
- 			break;
diff --git a/community-testing/packagekit/packagekit.install b/community-testing/packagekit/packagekit.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/community-testing/packagekit/packagekit.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/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD
deleted file mode 100644
index 4a03ded15..000000000
--- a/community-testing/percona-server/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=percona-server
-pkgver=5.5.18_rel23.0
-pkgrel=1
-pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
-arch=('i686' 'x86_64')
-
-depends=('mysql-clients' 'libaio')
-conflicts=('mysql')
-provides=('mysql')
-optdepends=('perl-dbi' 'perl-dbd-mysql')
-makedepends=('cmake' 'openssl' 'zlib')
-
-license=('GPL')
-url="http://www.percona.com/software/percona-server/"
-options=('!libtool' 'emptydirs')
-backup=('etc/mysql/my.cnf')
-install=percona.install
-source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/Percona-Server-${pkgver/_/-}.tar.gz"
-        'mysqld'
-        'my.cnf')
-
-build() {
-	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
-	sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt
-
-	cd "${srcdir}"
-	rm -rf build
-	mkdir build
-	cd build
-
-	# CFLAGS/CXXFLAGS as suggested upstream
-	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
-	cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \
-		-DMANUFACTURER=Arch \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DSYSCONFDIR=/etc/mysql \
-		-DMYSQL_DATADIR=/var/lib/mysql \
-		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		-DDEFAULT_CHARSET=utf8 \
-		-DDEFAULT_COLLATION=utf8_general_ci \
-		-DENABLED_LOCAL_INFILE=ON \
-		-DINSTALL_INFODIR=share/mysql/docs \
-		-DINSTALL_MANDIR=share/man \
-		-DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
-		-DINSTALL_SCRIPTDIR=bin \
-		-DINSTALL_INCLUDEDIR=include/mysql \
-		-DINSTALL_DOCREADMEDIR=share/mysql \
-		-DINSTALL_SUPPORTFILESDIR=share/mysql \
-		-DINSTALL_MYSQLSHAREDIR=share/mysql \
-		-DINSTALL_DOCDIR=share/mysql/docs \
-		-DINSTALL_SHAREDIR=share/mysql \
-		-DWITH_READLINE=OFF \
-		-DWITH_ZLIB=system \
-		-DWITH_SSL=system \
-		-DWITH_LIBWRAP=OFF \
-		-DWITH_LIBEDIT=OFF \
-		-DWITH_UNIT_TESTS=OFF \
-		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-		-DWITH_EXTRA_CHARSETS=complex \
-		-DWITH_EMBEDDED_SERVER=ON \
-		-DWITH_INNOBASE_STORAGE_ENGINE=ON \
-		-DWITH_PARTITION_STORAGE_ENGINE=ON \
-		-DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \
-		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
-		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
-		-DWITH_FEDERATED_STORAGE_ENGINE=OFF \
-		-DWITH_EXAMPLE_STORAGE_ENGINE=OFF
-
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR=${pkgdir} install
-
-	install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-	install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
-
-	# provided by libmysqlclient
-	rm ${pkgdir}/usr/bin/mysql_config
-	rm ${pkgdir}/usr/lib/libmysql*
-	rm -r ${pkgdir}/usr/include/
-	rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
-	# provided by mysql-clients
-	rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-	rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-	# not needed
-	rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
-	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-	install -dm700 "${pkgdir}"/var/lib/mysql
-}
-
-md5sums=('17b266f5c10d01838522188f313a1ead'
-         '243864805611764a7e5883c1dba7afd8'
-         '1c949c0dbea5206af0db14942d9927b6')
diff --git a/community-testing/percona-server/my.cnf b/community-testing/percona-server/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/community-testing/percona-server/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/community-testing/percona-server/mysqld b/community-testing/percona-server/mysqld
deleted file mode 100755
index 07f6b7e4c..000000000
--- a/community-testing/percona-server/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Percona Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Percona Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/percona-server/percona.install b/community-testing/percona-server/percona.install
deleted file mode 100644
index caacccf1b..000000000
--- a/community-testing/percona-server/percona.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  /usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/community-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD
deleted file mode 100644
index d57c0ede6..000000000
--- a/community-testing/perl-berkeleydb/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 61880 2012-01-09 18:50:05Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Charles Mauch <cmauch@gmail.com>
-# Contributor: Francois Charette <firmicus@gmx.net>
-
-pkgname=perl-berkeleydb
-pkgver=0.50
-pkgrel=2
-pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/BerkeleyDB/"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'db')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('6afc8f49133c262c606d1b96e1412863')
-
-build() {
-  cd  $srcdir/BerkeleyDB-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  _dbver=`pacman -Q db | cut -d\  -f2 | cut -d- -f1`
-  depends=('perl' "db=$_dbver")
-
-  cd  $srcdir/BerkeleyDB-$pkgver
-  make pure_install doc_install DESTDIR=$pkgdir
-  find $pkgdir -name '.packlist' -delete
-  find $pkgdir -name '*.pod' -delete
-}
diff --git a/community-testing/pinot/PKGBUILD b/community-testing/pinot/PKGBUILD
deleted file mode 100644
index 8dd7c740a..000000000
--- a/community-testing/pinot/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 62017 2012-01-14 12:25:05Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pinot
-pkgver=0.98
-pkgrel=2
-pkgdesc='Personal search and metasearch tool'
-arch=('i686' 'x86_64')
-url='http://pinot.berlios.de/'
-license=('GPL')
-depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl'
-         'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 
-         'hicolor-icon-theme' 'cairo' 'exiv2')
-makedepends=('boost' 'desktop-file-utils')
-optdepends=('unzip: ZIP files extraction'
-            'poppler: PDF to text conversion'
-            'catdvi: DVI to text conversion'
-            'djvulibre: DjVu text extraction'
-            'unrtf: RTF to HTML conversion'
-            'antiword: MS Word to text conversion'
-            'catdoc: XLS and PPT to text conversion'
-            'deskbar-applet: Pinot Deskbar-Applet module')
-options=('!emptydirs')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
-  sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm   russian-iso8859_5\n\
-/usr/share/libtextcat/LM/russian-koi8_r.lm      russian-koi8_r\n\
-/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat_conf.txt
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-
-  # Remove Deskbar-Applet handler
-  rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers
-}
diff --git a/community-testing/pinot/pinot.changelog b/community-testing/pinot/pinot.changelog
deleted file mode 100644
index 7d899cdb0..000000000
--- a/community-testing/pinot/pinot.changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* pinot 0.98-1
diff --git a/community-testing/pinot/pinot.install b/community-testing/pinot/pinot.install
deleted file mode 100644
index 55ab40426..000000000
--- a/community-testing/pinot/pinot.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo "Starting with 0.63, the service is auto-started. "
-  echo "The file that enables this is located at "
-  echo "/etc/xdg/autostart/pinot-dbus-daemon.desktop"
-  echo "Delete this file if you don't want the auto-start."
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/pkgtools/PKGBUILD b/community-testing/pkgtools/PKGBUILD
deleted file mode 100644
index 922bb5fa3..000000000
--- a/community-testing/pkgtools/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
-pkgname=pkgtools
-pkgver=23
-pkgrel=3
-pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
-license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
-backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg'
-            'python-yaml: for gem2arch'
-            'python2: for pkgconflict')
-md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
-
-build() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make
-}
-
-package() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make DESTDIR="$pkgdir" install
-
-  # fix infinite loop in autotools configure scripts
-  sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/pkgtools/pkgtools.install b/community-testing/pkgtools/pkgtools.install
deleted file mode 100644
index bcbf2f85c..000000000
--- a/community-testing/pkgtools/pkgtools.install
+++ /dev/null
@@ -1,66 +0,0 @@
-_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
-_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
-   If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
-_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
-   This will automatically run pkgfile whenever you run
-   a command which the shell cannot find. If you want
-   this functionality, set CMD_SEARCH_ENABLED to 1 in
-   /etc/pkgtools/pkgfile.conf (or per-user by copying
-   that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
-   in your current shell run:
-     source /etc/profile"
-
-is_update_from() {
-  res="`vercmp $1 $2`"
-  case $res in
-    '-1'|'0') return 0;;
-    '1') return 1;;
-  esac
-}
-
-## arg 1:  the new package version
-post_install() {
-  echo "$_MSG_UPDATE"
-  echo "$_MSG_HOOK"
-  echo "$_MSG_CRON"
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if is_update_from $2 11-1; then
-    echo " - All bugs related to pkgfile -b should be fixed in this update."
-  fi
-  if is_update_from $2 12-1; then
-    echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
-    echo "   Please remove any old symlinks relating to it."
-    echo "$_MSG_HOOK"
-  fi
-  if is_update_from $2 15-1; then
-    echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
-    echo "   run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
-  fi
-  if is_update_from $2 18-1; then
-    echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
-  fi
-  if is_update_from $2 19-1; then
-    echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
-    echo "   regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
-    echo "   in /etc/pkgtools/pkgfile.conf"
-    echo " - This version of pkgtools contains a new tool called 'maintpkg'"
-    echo "   It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
-  fi
-  if is_update_from $2 22-1; then
-    echo " - This is the largest release in a long time. This updates all python scripts to py3k."
-    echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
-  fi
-}
-
-## arg 1:  the old package version
-post_remove() {
-  cat << _EOM
- - You may want to clean /var/cache/pkgtools/lists
-_EOM
-}
-
-# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community-testing/poedit/PKGBUILD b/community-testing/poedit/PKGBUILD
deleted file mode 100644
index 59e2358a5..000000000
--- a/community-testing/poedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61882 2012-01-09 18:50:15Z stephane $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=poedit
-pkgver=1.4.6.1
-pkgrel=6
-pkgdesc="Cross-platform gettext catalogs (.po files) editor"
-arch=('i686' 'x86_64')
-url="http://www.poedit.net/"
-license=('custom')
-depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext')
-makedepends=('pkgconfig')
-install=poedit.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c63ffd991b1a6085ef356a6922356e0a')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-    install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/poedit/poedit.install b/community-testing/poedit/poedit.install
deleted file mode 100644
index 21b79d2d4..000000000
--- a/community-testing/poedit/poedit.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() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE
deleted file mode 100644
index 7d6035775..000000000
--- a/community-testing/python-bsddb/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2008-2009 Jesus Cea Avion
-
-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.
\ No newline at end of file
diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD
deleted file mode 100644
index 8f7c2fb53..000000000
--- a/community-testing/python-bsddb/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 61884 2012-01-09 18:50:28Z stephane $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-bsddb
-pkgname=('python2-bsddb' 'python-bsddb')
-pkgver=5.2.0
-pkgrel=3
-pkgdesc="Python interface for BerkeleyDB"
-license=('MIT')
-arch=('i686' 'x86_64')
-url="http://www.jcea.es/programacion/pybsddb.htm"
-makedepends=('python2-distribute' 'python-distribute')
-source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
-        db_5.3.patch
-        LICENSE)
-sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8'
-          '150bb6ce1758ca29f55e876ac75dbac76c9d743d'
-          'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-build () {
-  cd "${srcdir}"
-  
-  pushd bsddb3-${pkgver}
-  patch -Np1 -i ../db_5.3.patch
-  popd
-
-  cp -r bsddb3-${pkgver}{,-python2}
-
-  # Build python 3 module
-  cd bsddb3-${pkgver}
-  python setup.py --berkeley-db=/usr build
-
-  # Build python 2 module
-  cd ../bsddb3-${pkgver}-python2
-  python2 setup.py --berkeley-db=/usr build
-}
-
-package_python2-bsddb() {
-  depends=('db' 'python2>=2.7')
-  cd "${srcdir}/bsddb3-${pkgver}-python2"
-
-  python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python-bsddb() {
-  depends=('db' 'python>=3.2')
-  cd "${srcdir}/bsddb3-${pkgver}"
-
-  python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/python-bsddb/db_5.3.patch b/community-testing/python-bsddb/db_5.3.patch
deleted file mode 100644
index 6ea4d18bb..000000000
--- a/community-testing/python-bsddb/db_5.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Jesus Cea <jcea@jcea.es>
-# Date 1324876054 -3600
-# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12
-# Parent  670b1ec4472908a9dc745a338a9f595f92aba667
-Support Berkeley DB 5.3.x
-
-diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py
---- a/setup2.py	Mon Dec 26 06:04:34 2011 +0100
-+++ b/setup2.py	Mon Dec 26 06:07:34 2011 +0100
-@@ -128,7 +128,7 @@
-     incdir = libdir = None
-     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
-         # Supported Berkeley DB versions, in order of preference.
--        db_ver_list = ((5, 2), (5, 1), (5, 0),
-+        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
-                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2))
- 
-         # construct a list of paths to look for the header file in on
-
diff --git a/community-testing/speed-dreams/speed-dreams.sh b/community-testing/speed-dreams/speed-dreams.sh
deleted file mode 100644
index fa6dde97a..000000000
--- a/community-testing/speed-dreams/speed-dreams.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /opt/speed-dreams/bin
-./speed-dreams
diff --git a/community-testing/tomoyo-tools/PKGBUILD b/community-testing/tomoyo-tools/PKGBUILD
deleted file mode 100644
index c2e406cd5..000000000
--- a/community-testing/tomoyo-tools/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 61687 2012-01-06 17:27:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
-
-pkgname=tomoyo-tools
-_basever=2.5.0
-_timestamp=20111025
-_file=53357
-pkgver=${_basever}.${_timestamp}
-pkgrel=1
-pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0'
-arch=('i686' 'x86_64')
-url='http://tomoyo.sourceforge.jp'
-#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
-license=('GPL')
-depends=('ncurses')
-conflicts=('ccs-tools')
-install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('99999779698ea5f44c74d49e8c640ec1')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  make -j1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make INSTALLDIR="${pkgdir}" install
-}
diff --git a/community-testing/tomoyo-tools/tomoyo-tools.install b/community-testing/tomoyo-tools/tomoyo-tools.install
deleted file mode 100644
index 695a53f19..000000000
--- a/community-testing/tomoyo-tools/tomoyo-tools.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-  echo
-  echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
-  echo "   boot options and initialize policy with this command:"
-  echo "     /usr/lib/tomoyo/init_policy"
-  echo
-}
-
-post_upgrade () {
-    post_install $1
-}
diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD
deleted file mode 100644
index 297df9eb7..000000000
--- a/community-testing/vdrift/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 61760 2012-01-07 13:17:55Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2011.10.22
-pkgrel=3
-pkgdesc="An open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('6f8806ab1be303e9e1e47522c9eee890')
-install=vdrift.install
-
-build() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
-  #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp
-  #sed -i '/types.h/d' src/http.h
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-
-  # install icons
-  install -Dm644 data/textures/icons/vdrift-16x16.png \
-    "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-32x32.png \
-    "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png \
-    "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
-
-  rm -r $pkgdir/usr/share/vdrift
-}
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/vdrift/vdrift.desktop b/community-testing/vdrift/vdrift.desktop
deleted file mode 100644
index 7078f0d9c..000000000
--- a/community-testing/vdrift/vdrift.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=VDrift
-Version=2009-06-15
-GenericName=Racing Simulation
-Comment=An open source driving simulation made with drift racing in mind
-Exec=vdrift
-Icon=vdrift.png
-Terminal=false
-Categories=Game;Simulation;
diff --git a/community-testing/vdrift/vdrift.install b/community-testing/vdrift/vdrift.install
deleted file mode 100644
index 868f6717b..000000000
--- a/community-testing/vdrift/vdrift.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
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 ea3d9e7ce..000000000
--- a/community-testing/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 61651 2012-01-05 16:53:34Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
-pkgver=4.1.8
-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=('2092bba46baa62fab5520d67dee2ece8'
-         '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}_OSE"
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    ./configure \
-        --with-linux=/usr/src/linux-${_kernver} \
-        --disable-java \
-        --disable-docs \
-        --disable-xpcom \
-        --disable-python \
-        --disable-sdl-ttf \
-        --disable-alsa \
-        --disable-pulse \
-        --disable-dbus  \
-        --disable-opengl \
-        --build-headless \
-        --nofatal
-    source ./env.sh
-    kmk all
-
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-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}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
-    for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
-        install -D -m644 ${module} \
-            "$pkgdir/lib/modules/${_extramodules}/${module}"
-    done
-
-    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
-        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-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}_OSE/env.sh"
-
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-
-    install -D -m644 vboxdrv.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
-
-    install -D -m644 vboxnetadp.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
-
-    install -D -m644 vboxnetflt.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
-
-    install -D -m644 vboxpci.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
deleted file mode 100644
index 74af049cc..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.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-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install
deleted file mode 100644
index eeab16ca9..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.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-testing/xfmedia/PKGBUILD b/community-testing/xfmedia/PKGBUILD
deleted file mode 100644
index f2b4b3b97..000000000
--- a/community-testing/xfmedia/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 61733 2012-01-07 05:11:32Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Tom Killian <tomk@runbox.com>
-# Contributor: Spider.007 <archPackage@spider007.net>
-
-pkgname=xfmedia
-pkgver=0.9.2
-pkgrel=10
-pkgdesc="xfce media player"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://spuriousinterrupt.org/projects/xfmedia/"
-depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib')
-makedepends=('intltool' 'libxt')
-install=xfmedia.install
-source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
-	xfmedia-dbus-0.6-support.patch
-	xfmedia-empty-prev-next-fix.patch
-	xfmedia-exo-0.6.patch
-	xfmedia-xine-1.2.0.patch)
-md5sums=('6eb8bd1f67201f829e0f45e733c02bd5'
-         '8f2aa12eea584de65d8ed28179e56b51'
-         '650f8cb9e2ddd9a8a2a03748b8757110'
-         'f5e17fcdf2056dcc8ca8aae8600c0132'
-         '934603c7d3a1a0a66edb847bcb930df1')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ../xfmedia-dbus-0.6-support.patch
-  patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch
-  patch -Np1 -i ../xfmedia-exo-0.6.patch
-  patch -Np1 -i ../xfmedia-xine-1.2.0.patch
-  LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch
deleted file mode 100644
index 9b1eb3678..000000000
--- a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c
---- xfmedia-0.9.1.orig/src/remote.c	2005-09-05 00:56:37.000000000 -0400
-+++ xfmedia-0.9.1/src/remote.c	2006-04-08 00:27:18.000000000 -0400
-@@ -55,6 +55,10 @@
- #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
- #endif
- 
-+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
-+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
-+#endif
-+
- #endif  /* HAVE_DBUS */
- 
- #include <libxfce4util/libxfce4util.h>
diff --git a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch
deleted file mode 100644
index e2d0d8166..000000000
--- a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c
---- xfmedia-0.9.2/src/mainwin.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/mainwin.c	2010-11-01 13:01:17.000000000 +0000
-@@ -1865,6 +1865,10 @@
-     gboolean use_playlist_q  = xfmedia_playlist_queue_n_entries(mwin->playlist_q);
-     gboolean ret = FALSE;
-     
-+    if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
-+//    if(xfmedia_playlist_queue_is_empty(mwin->plist))
-+	return;
-+
-     if(mwin->cur_playing
-        && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")
-        && !use_playlist_q )
-@@ -1899,6 +1903,10 @@
- {
-     gint tot_items, idx = -1;
-     
-+    if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
-+//    if(xfmedia_playlist_queue_is_empty(mwin->plist))
-+	return;
-+
-     if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) {
-         XfmediaPlaylistEntryRef *ref = NULL;
-         gboolean playing = FALSE;
diff --git a/community-testing/xfmedia/xfmedia-exo-0.6.patch b/community-testing/xfmedia/xfmedia-exo-0.6.patch
deleted file mode 100644
index 1de611c82..000000000
--- a/community-testing/xfmedia/xfmedia-exo-0.6.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure
---- xfmedia-0.9.2/configure	2006-11-27 20:20:59.000000000 +0000
-+++ xfmedia-0.9.2.my/configure	2011-01-31 17:15:58.000000000 +0000
-@@ -27417,7 +27417,7 @@
- 
- 
-   if test x"$xdt_cv_EXO_check" = x"yes"; then
--    if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then
-+    if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then
- 
- 
-   # minimum supported version of pkg-config
-@@ -27501,22 +27501,22 @@
-   fi
- 
- 
--  { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5
--echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
--  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
--    EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
-+  { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5
-+echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; }
-+  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
-+    EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
-     { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
- echo "${ECHO_T}$EXO_VERSION" >&6; }
- 
-     { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
- echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
--    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
-+    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
-     { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
- echo "${ECHO_T}$EXO_CFLAGS" >&6; }
- 
-     { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
- echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
--    EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
-+    EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
-     { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
- echo "${ECHO_T}$EXO_LIBS" >&6; }
- 
-@@ -27535,15 +27535,15 @@
- 
-         EXO_FOUND="yes"
- 
--  elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
--    xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
-+  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
-+    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
-     { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
- echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
- 
- 
--      echo "*** The required package exo-0.3 was found on your system,"
-+      echo "*** The required package exo-1 was found on your system,"
-       echo "*** but the installed version ($xdt_cv_version) is too old."
--      echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
-+      echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
-       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
-       echo "*** the new version of the package in a nonstandard prefix so"
-       echo "*** pkg-config is able to find it."
-@@ -27554,8 +27554,8 @@
- echo "${ECHO_T}not found" >&6; }
- 
- 
--      echo "*** The required package exo-0.3 was not found on your system."
--      echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
-+      echo "*** The required package exo-1 was not found on your system."
-+      echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
-       echo "*** the PKG_CONFIG_PATH environment variable if you"
-       echo "*** installed the package in a nonstandard prefix so that"
-       echo "*** pkg-config is able to find it."
-@@ -27564,14 +27564,14 @@
-   fi
- 
-     else
--      { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5
--echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
-+      { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5
-+echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; }
-       { echo "$as_me:$LINENO: result: not found" >&5
- echo "${ECHO_T}not found" >&6; }
-     fi
-   else
--    { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5
--echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for optional package exo-1" >&5
-+echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; }
-     { echo "$as_me:$LINENO: result: disabled" >&5
- echo "${ECHO_T}disabled" >&6; }
-   fi
-diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c
---- xfmedia-0.9.2/src/main.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/main.c	2011-02-01 11:08:02.000000000 +0000
-@@ -388,6 +388,23 @@
-     return optind;
- }
- 
-+/**
-+ * exo_str_get_md5_str:
-+ * @contents : The string to create a digest of.
-+ *
-+ * Creates a character array MD5 digestof the string
-+ * @contents.
-+ *
-+ * Return value: A newly-allocated character array which
-+ *               should be free with g_free() when no
-+ *               longer needed.
-+ **/
-+gchar*
-+exo_str_get_md5_str (const gchar *contents)
-+{
-+  return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1);
-+}
-+
- int
- main(int argc, char **argv)
- {
-diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c
---- xfmedia-0.9.2/src/mediamarks.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/mediamarks.c	2011-02-01 11:04:42.000000000 +0000
-@@ -684,9 +684,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     gtk_tree_view_column_pack_start(col, render, TRUE);
-@@ -1693,9 +1693,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     gtk_tree_view_column_pack_start(col, render, TRUE);
-@@ -1705,9 +1705,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
-diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c
---- xfmedia-0.9.2/src/playlist.c	2006-11-27 07:21:22.000000000 +0000
-+++ xfmedia-0.9.2.my/src/playlist.c	2011-02-01 11:04:47.000000000 +0000
-@@ -1409,9 +1409,9 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
- 	if(gtk_major_version == 2 && gtk_minor_version >= 6)
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- 	else {
--		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- 				"ellipsize-set", TRUE, NULL);
- 	}
-     col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
-diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c
---- xfmedia-0.9.2/src/settings-dialog.c	2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/settings-dialog.c	2011-02-01 11:04:53.000000000 +0000
-@@ -552,7 +552,7 @@
-     render = exo_cell_renderer_ellipsized_text_new();
-     col = gtk_tree_view_column_new_with_attributes("name", render,
-             "text", PLUGINS_NAME, NULL);
--    g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+    g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
-             "ellipsize-set", TRUE, NULL);
-     gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
-     
-diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c
---- xfmedia-0.9.2/src/xfmedia-playlist-queue.c	2006-11-27 07:21:22.000000000 +0000
-+++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c	2011-02-01 11:04:57.000000000 +0000
-@@ -171,7 +171,7 @@
-     
-     render = exo_cell_renderer_ellipsized_text_new();
-     g_object_set(G_OBJECT(render),
--                 "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+                 "ellipsize", PANGO_ELLIPSIZE_END,
-                  "ellipsize-set", TRUE,
-                  NULL);
-     col = gtk_tree_view_column_new_with_attributes("display-name", render,
diff --git a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch
deleted file mode 100644
index 2e04ac80a..000000000
--- a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c
---- xfmedia-0.9.2/src/xfmedia-xine.c	2006-11-27 10:21:23.000000000 +0300
-+++ xfmedia-0.9.2.my/src/xfmedia-xine.c	2012-01-05 01:23:21.000000000 +0400
-@@ -1450,17 +1450,6 @@
- }
- 
- gboolean
--xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value)
--{
--
--    g_return_val_if_fail(xfx != NULL, 0);
--    g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0);
--    g_return_val_if_fail(xfx->priv->stream != NULL, 0);
--
--    return xine_trick_mode(xfx->priv->stream, mode, value);
--}
--
--gboolean
- xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream,
-     gint *pos_time, gint *length_time)
- {
-diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h
---- xfmedia-0.9.2/src/xfmedia-xine.h	2006-11-27 10:21:23.000000000 +0300
-+++ xfmedia-0.9.2.my/src/xfmedia-xine.h	2012-01-05 01:20:47.000000000 +0400
-@@ -87,9 +87,6 @@
- gboolean     xfmedia_xine_play                       (XfmediaXine *xfx,
-                                                   gint pos,
-                                                   gint start_time);
--gboolean     xfmedia_xine_trick_mode                 (XfmediaXine *xfx,
--                                                  gint mode,
--                                                  gint value);
- gint         xfmedia_xine_get_stream_info            (XfmediaXine *xfx,
-                                                   gint info);
- G_CONST_RETURN gchar *xfmedia_xine_get_meta_info     (XfmediaXine *xfx,
diff --git a/community-testing/xfmedia/xfmedia.install b/community-testing/xfmedia/xfmedia.install
deleted file mode 100644
index b95cc069d..000000000
--- a/community-testing/xfmedia/xfmedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community/arpack/arpack-2.1-redhat.patch b/community/arpack/arpack-2.1-redhat.patch
deleted file mode 100644
index 154bff5d4..000000000
--- a/community/arpack/arpack-2.1-redhat.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- ARPACK/ARmake.inc~	1996-04-26 21:12:57.000000000 +0200
-+++ ARPACK/ARmake.inc	2003-07-19 11:57:10.000000000 +0200
-@@ -25,7 +25,7 @@
- # | other than your home directory.      |
- # %--------------------------------------%
- #
--home = $(HOME)/ARPACK
-+home = $(PWD)/.
- #
- #  %--------------------------------------%
- #  | The platform identifier to suffix to |
-@@ -43,7 +43,7 @@
- UTILdir      = $(home)/UTIL
- SRCdir       = $(home)/SRC
- #
--DIRS        = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir)
-+#DIRS        = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir)
- #
- # %-------------------------------------------------------------------%
- # | Comment out the previous line and uncomment the following         |
-@@ -51,13 +51,13 @@
- # | NOTE: ARPACK assumes the use of LAPACK version 2 codes.           |
- # %-------------------------------------------------------------------%
- #
--#DIRS         = $(UTILdir) $(SRCdir)
-+DIRS         = $(UTILdir) $(SRCdir)
- #
- # %---------------------------------------------------%
- # | The name of the libraries to be created/linked to |
- # %---------------------------------------------------%
- #
--ARPACKLIB  = $(home)/libarpack_$(PLAT).a
-+ARPACKLIB  = $(home)/libarpack.a
- LAPACKLIB = 
- BLASLIB = 
- #
-@@ -112,7 +112,7 @@
- LN      = ln
- LNFLAGS = -s
- 
--MAKE    = /bin/make
-+MAKE    = make
- 
- RM      = rm
- RMFLAGS = -f
---- ARPACK/UTIL/second.f.old 2008-07-08 17:38:51.759444357 +0200
-+++ ARPACK/UTIL/second.f 2008-07-08 17:39:37.056301918 +0200
-@@ -21,7 +21,6 @@
- *     ..
- *     .. External Functions ..
-       REAL               ETIME
--      EXTERNAL           ETIME
- *     ..
- *     .. Executable Statements ..
- *
diff --git a/community/arpack/license.txt b/community/arpack/license.txt
deleted file mode 100644
index 11a5aea58..000000000
--- a/community/arpack/license.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Rice BSD Software License
-Permits source and binary redistribution of the software ARPACK and
-P_ARPACK  for both non-commercial and commercial use. 
-
-Copyright (�) 2001, Rice University
-Developed by D.C. Sorensen, R.B. Lehoucq, C. Yang, and K. Maschhoff.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer. 
-   
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution. 
-
-   * If you modify the source for these routines we ask that you
-     change the name of the routine and comment the changes made to
-     the original. 
-
-   * Written notification is provided to the developers of  intent to
-     use this software.  Also, we ask that use of ARPACK is properly
-     cited in any resulting publications or software documentation.  
-
-   * Neither the name of Rice University (RICE) 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 RICE 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 RICE 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/community/bacula/PKGBUILD b/community/bacula/PKGBUILD
deleted file mode 100644
index 2c86520c9..000000000
--- a/community/bacula/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: Calogero Lo Leggio <kalos@autistici.org>
-# Contributor: Matias Hernandez <msdark@archlinux.cl>
-
-pkgname=bacula
-pkgver=5.2.2
-pkgrel=1
-pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)"
-arch=("i686" "x86_64")
-url="http://www.${pkgname}.org"
-license=("GPL")
-depends=("libmysqlclient")
-makedepends=("qt" "wxgtk" "gtk2")
-optdepends=("qt: for bat"
-            "wxgtk: for bwx console"
-            "gtk2: for tray monitor")
-options=(!buildflags !libtool)
-conflicts=("${pkgname}-sqlite" "${pkgname}-postgresql" "${pkgname}-client")
-backup=("etc/${pkgname}/bconsole.conf"
-		"etc/${pkgname}/${pkgname}-dir.conf"
-		"etc/${pkgname}/${pkgname}-fd.conf"
-		"etc/${pkgname}/${pkgname}-sd.conf")
-install="${pkgname}.install"
-source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        ${pkgname}-sd.rc.d
-        ${pkgname}-fd.rc.d
-        ${pkgname}-dir.rc.d)
-md5sums=('227b88f56ae085da8f48823b220d4c87'
-         'e7be4c9fb3c7ce334f9ee24d71652d3e'
-         'a9a070a862e9cf39ae4bc374409c721d'
-         '55619ae3094c698541a3bfedc87bdb48')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	# Build
-	./configure --prefix=/usr \
-		--enable-build-dird --enable-build-stored --enable-smartalloc \
-		--enable-bat --enable-tray-monitor --enable-bwx-console \
-		--with-mysql --without-openssl \
-		--with-dir-user=${pkgname} --with-dir-group=${pkgname} \
-		--with-sd-user=${pkgname} --with-sd-group=${pkgname} \
-		--sysconfdir=/etc/${pkgname} --with-scriptdir=/etc/${pkgname}/scripts \
-		--with-working-dir=/var/cache/${pkgname}/working \
-		--with-subsys-dir=/var/cache/${pkgname}/working \
-		--with-archivedir=/var/cache/${pkgname}/archive
-
-	make
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
-
-	# Permissions
-	chmod a+x ${pkgdir}/etc/${pkgname}/scripts/{update_${pkgname}_tables,delete_catalog_backup,update_mysql_tables,make_catalog_backup,bconsole}
-
-	# Daemons
-	mkdir -p ${pkgdir}/etc/rc.d/
-    install -Dm755 ${srcdir}/*.rc.d ${pkgdir}/etc/rc.d/
-
-	# Logs
-	install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
-	sed -i "s|/var/cache/${pkgname}/working/log|/var/log/${pkgname}.log|g" ${pkgdir}/etc/{${pkgname}/${pkgname}-dir.conf,logrotate.d/${pkgname}}
-}
-
diff --git a/community/bacula/bacula-dir.rc.d b/community/bacula/bacula-dir.rc.d
deleted file mode 100644
index a5a103dca..000000000
--- a/community/bacula/bacula-dir.rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/bacula ] || mkdir -p /var/run/bacula
-	chown bacula:bacula /var/run/bacula
-
-    stat_busy "Starting Bacula Director Daemon"
-    /usr/sbin/bacula-dir
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon bacula-dir
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Bacula Director Daemon"
-    killall bacula-dir > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon bacula-dir
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-~                                                                                                                                                         
-~         
diff --git a/community/bacula/bacula-fd.rc.d b/community/bacula/bacula-fd.rc.d
deleted file mode 100644
index 3817a0fed..000000000
--- a/community/bacula/bacula-fd.rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/bacula ] || mkdir -p /var/run/bacula
-	chown bacula:bacula /var/run/bacula
-
-    stat_busy "Starting Bacula File Daemon"
-    /usr/sbin/bacula-fd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon bacula-fd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Bacula File Daemon"
-    killall bacula-fd > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon bacula-fd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-~                                                                                                                                                         
-~         
diff --git a/community/bacula/bacula-sd.rc.d b/community/bacula/bacula-sd.rc.d
deleted file mode 100644
index 96f200916..000000000
--- a/community/bacula/bacula-sd.rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/bacula ] || mkdir -p /var/run/bacula
-	chown bacula:bacula /var/run/bacula
-
-    stat_busy "Starting Bacula Storage Daemon"
-    /usr/sbin/bacula-sd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon bacula-sd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Bacula Storage Daemon"
-    killall bacula-sd > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon bacula-sd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-~                                                                                                                                                         
-~         
diff --git a/community/bacula/bacula.install b/community/bacula/bacula.install
deleted file mode 100644
index 4d061ddfa..000000000
--- a/community/bacula/bacula.install
+++ /dev/null
@@ -1,49 +0,0 @@
-post_install() {
-  if [ -z "`grep '^bacula::' /etc/group`" ]; then
-    echo "Adding bacula system group... "
-    groupadd -g 77 bacula >& /dev/null
-  fi
-
-  if [ -z "`grep '^bacula::' /etc/passwd`" ]; then
-    echo "Adding bacula system user... "
-    useradd -u 77 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula
-  fi
-
-  echo "Locking Bacula User Account..."
-  passwd -l bacula &>/dev/null
-
-  post_upgrade
-}
-
-post_upgrade() {
-
-cat << EOM
-
-Note:
-==> Please don't forget to config your MySQL database for the program.
-==>
-==>  1. If you have not init your MySQL DB yet, run mysql_install_db.
-==>  2. Run /etc/bacula/scripts/grant_mysql_privileges. This script creates database user
-==>     'bacula' with unrestricted rights to the bacula's database. The
-==>     script create  user is without any password. You may want to edit
-==>     the script before run it.
-==>  3. Run /etc/bacula/scripts/create_mysql_database to create the Database
-==>     Bacula.
-==>  4. Run /etc/bacula/scripts/make_mysql_tables to create tables used by bacula.
-
-==> The archive directory is: /var/cache/bacula
-
-==> Bacula's offical website : http://www.bacula.org
-
-EOM
-}
-
-post_remove() {
-  echo "Removing Bacula's system users..."
-  userdel bacula &> /dev/null
-  groupdel bacula &> /dev/null
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
diff --git a/community/cdfs/cdfs-3.0.0.patch b/community/cdfs/cdfs-3.0.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/community/cdfs/cdfs-3.0.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD
deleted file mode 100644
index c5ff14f7f..000000000
--- a/community/clementine/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 61660 2012-01-05 21:38:03Z stephane $
-#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle <ike.devolder@gmail.com>
-#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-
-pkgname=clementine
-pkgver=1.0.0
-pkgrel=3
-pkgdesc="A music player and library organizer"
-url="http://www.clementine-player.org/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
-         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
-         'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl')
-makedepends=('cmake' 'boost')
-optdepends=('gstreamer0.10-base-plugins: for more open formats'
-            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-            'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
-source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('ba49c686ea5759e33d6b89179965503fd369cf30')
-install=clementine.install
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/community/clementine/clementine.install b/community/clementine/clementine.install
deleted file mode 100644
index 2f0338d8a..000000000
--- a/community/clementine/clementine.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/dbus-sharp-glib/PKGBUILD b/community/dbus-sharp-glib/PKGBUILD
deleted file mode 100644
index bd28aeede..000000000
--- a/community/dbus-sharp-glib/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 39552 2011-02-11 14:42:53Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Alessio Biancalana <dottorblaster@gmail.com>
-
-pkgname=dbus-sharp-glib
-pkgver=0.5.0
-pkgrel=3
-pkgdesc="C# GLib implementation of D-Bus"
-arch=('i686' 'x86_64')
-url="http://github.com/mono/dbus-sharp/"
-license=('custom')
-depends=('dbus-sharp>=0.7')
-makedepends=('pkgconfig')
-options=(!makeflags)
-source=(https://github.com/downloads/mono/dbus-sharp/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2284293316eb3a89f0f78798b8a24418')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/community/deadbeef/ffmpeg.patch b/community/deadbeef/ffmpeg.patch
deleted file mode 100644
index 925b84408..000000000
--- a/community/deadbeef/ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c
---- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c	2011-05-22 13:58:53.000000000 +0000
-+++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c	2011-11-01 10:38:11.447669741 +0000
-@@ -140,7 +140,12 @@
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+		            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -490,7 +495,12 @@
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+		            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -745,7 +755,12 @@
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+			            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
diff --git a/community/dockmanager/PKGBUILD b/community/dockmanager/PKGBUILD
deleted file mode 100644
index 0d91fb975..000000000
--- a/community/dockmanager/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 39549 2011-02-11 14:30:10Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=dockmanager
-pkgver=0.1.0
-pkgrel=0.20110211
-pkgdesc="Dock-independent helper scripts for compatible docks"
-url="https://launchpad.net/dockmanager"
-arch=(i686 x86_64)
-license=(GPL)
-depends=('libdesktop-agnostic>=0.3.90-2' gconf dbus-glib python2)
-makedepends=(bzr 'vala>=0.10' pkgconfig intltool autoconf gnome-common)
-conflicts=(dockmanager-bzr)
-provides=("dockmanager-bzr")
-options=('!libtool' '!emptydirs')
-install=dockmanager.install
-source=(vala.patch)
-md5sums=('f6db8c3a432b41b620f6fcc8bfccfd81')
-
-__bzrtrunk=lp:dockmanager
-__bzrmod=dockmanager
-
-build() {
-  cd "$srcdir"
-
-  msg2 "Connecting to Launchpad...."
-
-  if [ -d $__bzrmod ] ; then
-    ( cd $__bzrmod && bzr up ) || warning "Bzr up failed!"
-  else
-    bzr checkout $__bzrtrunk $__bzrmod
-  fi
-
-  msg2 "BZR checkout done or server timeout"
-
-  rm -rf $pkgname-build
-  cp -r $__bzrmod $pkgname-build
-  cd $pkgname-build
-
-  msg2 "Starting make..."
-
-  patch -Np0 -i "$srcdir/vala.patch"
-
-  ./autogen.sh \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-build"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  # Fix for python2
-  find $pkgdir -type f -exec sed -i '1s|#!/usr/bin/env python$|&2|' {} +
-
-  mkdir -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/dockmanager.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -rf "$pkgdir/etc/gconf"
-}
diff --git a/community/dockmanager/dockmanager.install b/community/dockmanager/dockmanager.install
deleted file mode 100644
index 11d20ed8c..000000000
--- a/community/dockmanager/dockmanager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=dockmanager
-
-post_install() {
-  echo "Installing schema..."
-  gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  echo "Removing schema..."
-  gconfpkg --uninstall ${pkgname}
-}
diff --git a/community/dockmanager/vala.patch b/community/dockmanager/vala.patch
deleted file mode 100644
index efe01e474..000000000
--- a/community/dockmanager/vala.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-=== modified file 'daemon/tile.vala'
---- daemon/tile.vala	2010-12-01 23:39:56 +0000
-+++ daemon/tile.vala	2011-01-18 04:30:10 +0000
-@@ -185,10 +185,6 @@
-       {
-         try
-         {
--#if VALA_0_12
--#else
--          unowned
--#endif
-           Gdk.Pixbuf temp_pb;
-           unowned IconTheme it = IconTheme.get_default ();
-           try
-@@ -204,10 +200,6 @@
-                                     IconLookupFlags.FORCE_SIZE);
-           }
-           pixbuf = temp_pb.copy ();
--#if VALA_0_12
--#else
--          temp_pb.unref (); // careful here!
--#endif
-         }
-         catch (Error err)
-         {
-
diff --git a/community/docky/PKGBUILD b/community/docky/PKGBUILD
deleted file mode 100644
index 636d2e762..000000000
--- a/community/docky/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 49764 2011-06-21 00:08:54Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: dieghen89 <dieghen89@gmail.com>
-# Contributor: Alessio 'Bl@ster' Biancalana <dottorblaster@gmail.com>
-
-pkgname=docky
-pkgver=2.1.3
-pkgrel=1
-pkgdesc="The finest dock no money can buy!"
-url="https://launchpad.net/docky"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(gnome-desktop-sharp gnome-keyring-sharp gtk2 mono-addins
-         hicolor-icon-theme ndesk-dbus-glib notify-sharp-svn xdg-utils
-         desktop-file-utils dockmanager gio-sharp dbus-sharp-glib gconf-sharp)
-makedepends=(intltool libgnome-sharp)
-options=('!libtool' '!emptydirs')
-install=docky.install
-source=("http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz")
-md5sums=('7a40c25dff6b71c346e7791533f05b5f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  mkdir -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/docky.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -rf "$pkgdir/etc/gconf"
-}
diff --git a/community/docky/docky.install b/community/docky/docky.install
deleted file mode 100644
index 4e2242957..000000000
--- a/community/docky/docky.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=docky
-
-post_install() {
-  echo "Installing schema..."
-  gconfpkg --install ${pkgname}
-
-  echo "Updating desktop..."
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  echo "Removing schema..."
-  gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  echo "Updating desktop..."
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install
deleted file mode 100755
index a1223138e..000000000
--- a/community/fcron/fcron.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pre_install() {
-   # Create necessary user and group
-   getent group cron || /usr/sbin/groupadd -g 22 cron
-   getent passwd cron || /usr/sbin/useradd -d / -g cron -u 22 -s /bin/false cron
-}
-
-post_install() {
-    cat << "EOF"
-
-    Use fcrontab -u systab -e to edit the system crontab and change the defaults.
-
-    By default fcron uses vi as an editor for your crontab. If you want to use another editor
-    you can define it in /etc/fcron/fcron.conf. If for some odd reason you want to uninstall
-    vi and recompile fcron, you need to edit the PKGBUILD and pass
-    --with-editor=<pathtoyoureditor> to configure.
-
-    By default fcron uses /usr/sbin/sendmail (as in the packages providing smtp-sever, such as 
-    exim and postfix) to send mails about your cron jobs. If there is no /usr/sbin/sendmail you 
-    won't get mails. If you want to use a MTA with a different path you can define it 
-    /etc/fcron/fcron.conf.
-
-EOF
-}
diff --git a/community/ffmpeg2theora/ffmpeg2theora.changelog b/community/ffmpeg2theora/ffmpeg2theora.changelog
deleted file mode 100644
index adbe34807..000000000
--- a/community/ffmpeg2theora/ffmpeg2theora.changelog
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-10-09  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-	* ffmpeg2theora 0.28-1
-	* Upstream update
-
-2010-06-25  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.27-1
-	* Upstream update
-
-2010-02-05  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.26-1
-	* Upstream update
-	* Updated license
-	* Updated source url
-
-2010-01-10  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.25-1
-	* Upstream update
-	* Built against ffmpeg 20100108
-
-2009-06-06  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.24-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/community/filezilla/gnutls-3.patch b/community/filezilla/gnutls-3.patch
deleted file mode 100644
index 88e4ac9e7..000000000
--- a/community/filezilla/gnutls-3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix FS#25669
-
-Upstream bug: http://trac.filezilla-project.org/ticket/7742
-
-diff --git a/src/engine/tlssocket.cpp b/src/engine/tlssocket.cpp
-index e9a5105..7ddb1ae 100644
---- a/src/engine/tlssocket.cpp
-+++ b/src/engine/tlssocket.cpp
-@@ -97,7 +97,7 @@ bool CTlsSocket::Init()
- 		return false;
- 	}
- 
--	res = gnutls_priority_set_direct(m_session, "SECURE256:+CTYPE-X509:-CTYPE-OPENPGP", 0);
-+	res = gnutls_priority_set_direct(m_session, "NORMAL:+CTYPE-X509:-CTYPE-OPENPGP", 0);
- 	if (res)
- 	{
- 		LogError(res);
-@@ -113,7 +113,9 @@ bool CTlsSocket::Init()
- 	gnutls_transport_set_push_function(m_session, PushFunction);
- 	gnutls_transport_set_pull_function(m_session, PullFunction);
- 	gnutls_transport_set_ptr(m_session, (gnutls_transport_ptr_t)this);
-+#if GNUTLS_VERSION_MAJOR < 3
- 	gnutls_transport_set_lowat(m_session, 0);
-+#endif
- 
- 	m_shutdown_requested = false;
- 
diff --git a/community/flightgear-atlas/PKGBUILD b/community/flightgear-atlas/PKGBUILD
deleted file mode 100644
index 8cbd7a8ee..000000000
--- a/community/flightgear-atlas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
-
-pkgname=flightgear-atlas
-pkgver=0.3.1
-pkgrel=3
-arch=(i686 x86_64)
-pkgdesc="aims to produce and display high quality charts of the world for users of FlightGear."
-depends=('flightgear-data' 'libpng' 'libjpeg')
-makedepends=('simgear')
-url="http://atlas.sourceforge.net"
-license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/atlas/Atlas-$pkgver.tar.gz \
-	build-fix.patch)
-md5sums=('15bba54523a29928a14f17af449f960e'
-         '6ad0d34b617d9ca680a63c965479eb7c')
-
-build() {
-  cd $startdir/src/Atlas-$pkgver
-
-  patch -p1 <$srcdir/build-fix.patch
-
-  LDFLAGS="-lsgstructure" ./configure --prefix=/usr
-
-  perl -ne 's/LIBS =(.+)/LIBS =$1 -lsgstructure/g; print;' src/Makefile >src/Makefile2 && \
-  mv src/Makefile2 src/Makefile
-
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  mkdir -p $startdir/pkg/usr/share/FlightGear/data
-  cp $startdir/src/Atlas-$pkgver/src/AtlasPalette $startdir/pkg/usr/share/FlightGear/data
-}
diff --git a/community/flightgear-atlas/build-fix.patch b/community/flightgear-atlas/build-fix.patch
deleted file mode 100644
index 5f190d386..000000000
--- a/community/flightgear-atlas/build-fix.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-diff -wbBur Atlas-0.3.1/src/Atlas.cxx Atlas-0.3.1.my/src/Atlas.cxx
---- Atlas-0.3.1/src/Atlas.cxx	2006-10-28 16:28:32.000000000 +0000
-+++ Atlas-0.3.1.my/src/Atlas.cxx	2009-03-11 16:33:33.000000000 +0000
-@@ -29,7 +29,7 @@
- #include <memory.h>
- #include <stdio.h>
- #include <simgear/compiler.h>
--#include SG_GLUT_H
-+#include <GL/glut.h>
- #include <plib/fnt.h>
- #include <plib/pu.h>
- #include <string>
-@@ -40,6 +40,8 @@
- #include "Overlays.hxx"
- #include "FlightTrack.hxx"
- 
-+#include <iostream>
-+
- #define SCALECHANGEFACTOR 1.3f
- 
- SGIOChannel *input_channel;
-@@ -345,7 +347,7 @@
-     
- 	    string nav1_freq_str = msg.substr(begin, end - begin);
- 	    begin = end + 1;
--	    cout << "  nav1_freq = " << nav1_freq_str << endl;
-+	    std::cout << "  nav1_freq = " << nav1_freq_str << std::endl;
- 
- 	    // nav1 selected radial
- 	    end = msg.find(",", begin);
-@@ -355,7 +357,7 @@
-     
- 	    string nav1_rad_str = msg.substr(begin, end - begin);
- 	    begin = end + 1;
--	    cout << "  nav1_rad = " << nav1_rad_str << endl;
-+	    std::cout << "  nav1_rad = " << nav1_rad_str << std::endl;
- 
- 	    // nav2 freq
- 	    end = msg.find(",", begin);
-@@ -365,7 +367,7 @@
-     
- 	    string nav2_freq_str = msg.substr(begin, end - begin);
- 	    begin = end + 1;
--	    cout << "  nav2_freq = " << nav2_freq_str << endl;
-+	    std::cout << "  nav2_freq = " << nav2_freq_str << std::endl;
- 
- 	    // nav2 selected radial
- 	    end = msg.find(",", begin);
-@@ -375,7 +377,7 @@
-     
- 	    string nav2_rad_str = msg.substr(begin, end - begin);
- 	    begin = end + 1;
--	    cout << "  nav2_rad = " << nav2_rad_str << endl;
-+	    std::cout << "  nav2_rad = " << nav2_rad_str << std::endl;
- 
- 	    // adf freq
- 	    end = msg.find("*", begin);
-@@ -385,7 +387,7 @@
-     
- 	    string adf_freq_str = msg.substr(begin, end - begin);
- 	    begin = end + 1;
--	    cout << "  adf_freq = " << adf_freq_str << endl;
-+	    std::cout << "  adf_freq = " << adf_freq_str << std::endl;
- 
- 	    nav1_freq = atof( nav1_freq_str.c_str() );
- 	    nav1_rad =  atof( nav1_rad_str.c_str() ) * 
-diff -wbBur Atlas-0.3.1/src/FlightTrack.cxx Atlas-0.3.1.my/src/FlightTrack.cxx
---- Atlas-0.3.1/src/FlightTrack.cxx	2003-01-07 21:51:12.000000000 +0000
-+++ Atlas-0.3.1.my/src/FlightTrack.cxx	2009-03-11 16:33:33.000000000 +0000
-@@ -29,7 +29,7 @@
- }
- 
- FlightTrack::~FlightTrack() {
--  for (list<FlightData*>::iterator i = track.begin(); i != track.end(); i++) {
-+  for (std::list<FlightData*>::iterator i = track.begin(); i != track.end(); i++) {
-     delete *i;
-   }
- }
-diff -wbBur Atlas-0.3.1/src/FlightTrack.hxx Atlas-0.3.1.my/src/FlightTrack.hxx
---- Atlas-0.3.1/src/FlightTrack.hxx	2003-01-07 21:51:12.000000000 +0000
-+++ Atlas-0.3.1.my/src/FlightTrack.hxx	2009-03-11 16:33:30.000000000 +0000
-@@ -27,7 +27,7 @@
- #include <plib/sg.h>
- #include <simgear/compiler.h>
- 
--SG_USING_STD(list);
-+#include <list>
- 
- struct FlightData {
-   float lat, lon, alt, hdg, spd;
-@@ -51,8 +51,8 @@
- protected:
-   unsigned int max_buffer;
- 
--  list<FlightData*> track;
--  list<FlightData*>::iterator track_pos;
-+  std::list<FlightData*> track;
-+  std::list<FlightData*>::iterator track_pos;
- };
- 
- 
-diff -wbBur Atlas-0.3.1/src/Map.cxx Atlas-0.3.1.my/src/Map.cxx
---- Atlas-0.3.1/src/Map.cxx	2006-10-26 21:45:05.000000000 +0000
-+++ Atlas-0.3.1.my/src/Map.cxx	2009-03-11 16:35:10.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <plib/ul.h>
- 
- #include <simgear/compiler.h>
--#include SG_GL_H
-+#include <GL/gl.h>
- #ifdef UL_GLX
- #  define GLX_GLXEXT_PROTOTYPES
- #  ifdef __APPLE__
-@@ -50,7 +50,7 @@
- #elif defined UL_WIN32
- #  include <windows.h>
- #endif
--#include SG_GLUT_H
-+#include <GL/glut.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/stat.h>
-@@ -65,10 +65,10 @@
- #include <simgear/screen/RenderTexture.h>
- #include "Scenery.hxx"
- #include <vector>
--#include STL_STRING
-+#include <string>
- 
--SG_USING_STD(vector);
--SG_USING_STD(string);
-+#include <vector>
-+#include <iostream>
- 
- typedef vector<string> string_list;
- 
-@@ -319,9 +319,9 @@
- }
- 
- bool ContinueIfNoHeadless() {
--  cout << "Unable to continue in headless mode - revert to doublebuffer mode? [Y/n] ";
-+  std::cout << "Unable to continue in headless mode - revert to doublebuffer mode? [Y/n] ";
-   char c;
--  cin >> c;
-+  std::cin >> c;
-   return((c == 'n' || c == 'N') ? false : true);
- }
- 
-@@ -439,7 +439,7 @@
-     scenerypath = new char[max_path_length + 256];
-     scenery_pos = 0;
-   } else {
--    cout << "No scenery paths could be found.  You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n";
-+    std::cout << "No scenery paths could be found.  You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n";
-     exit(-1);
-   }
- 
-@@ -467,7 +467,7 @@
-     }
-     dir1 = ulOpenDir(outp);
-     if(NULL == dir1) {
--      cout << "Unable to create requested Atlas map directory " << outp << "... exiting :-(\n";
-+      std::cout << "Unable to create requested Atlas map directory " << outp << "... exiting :-(\n";
-       exit(-1);
-     }
- 
-@@ -502,17 +502,17 @@
-       if(dir1 != NULL) {
- 	path_found = true;
- 	scenerypath[sz] = '\0';
--	//cout << "Scenerypath found,  = " << scenerypath << '\n';
-+	//std::cout << "Scenerypath found,  = " << scenerypath << '\n';
- 	break;
-       }
--      //cout << scenerypath << (dir1 == NULL ? " does not exist..." : " exists!") << '\n';
-+      //std::cout << scenerypath << (dir1 == NULL ? " does not exist..." : " exists!") << '\n';
-     }
-     if(!path_found) {
--      cout << "Unable to find required subdirectory " << dpath1 << '/' << dpath2 << " on the available scenery paths:\n";
-+      std::cout << "Unable to find required subdirectory " << dpath1 << '/' << dpath2 << " on the available scenery paths:\n";
-       for(unsigned int i = 0; i < fg_scenery.size(); ++i) {
--	cout << fg_scenery[i] << '\n';
-+	std::cout << fg_scenery[i] << '\n';
-       }
--      cout << "... unable to continue - exiting!\n";
-+      std::cout << "... unable to continue - exiting!\n";
-       exit(-1);
-     }
-   }
-diff -wbBur Atlas-0.3.1/src/MapBrowser.cxx Atlas-0.3.1.my/src/MapBrowser.cxx
---- Atlas-0.3.1/src/MapBrowser.cxx	2005-09-29 19:18:01.000000000 +0000
-+++ Atlas-0.3.1.my/src/MapBrowser.cxx	2009-03-11 16:33:33.000000000 +0000
-@@ -112,7 +112,7 @@
- 
- void MapBrowser::changeResolution(char *path) {
-   MapTile *tile;
--  list<MapTile*>::iterator i = tiles.end(),
-+  std::list<MapTile*>::iterator i = tiles.end(),
-                            itmp;
-   i--;
-   while (tiles.begin() != tiles.end()) {
-@@ -171,7 +171,7 @@
-     glEnable( GL_TEXTURE_2D );
-     GLfloat tilesize = earth_radius_lat(clat) * SG_DEGREES_TO_RADIANS;
- 
--    for (list<MapTile*>::iterator i = tiles.begin(); i != tiles.end(); i++) {
-+    for (std::list<MapTile*>::iterator i = tiles.begin(); i != tiles.end(); i++) {
-       MapTile *tile = *i;
-       if ( tile->tex ) {
- 	GLfloat dxs = 0.5f;
-@@ -237,7 +237,7 @@
-   if (max_lat >  90) max_lat =  90;
-   int num_lat = (max_lat - min_lat) + 1, num_lon = (max_lon - min_lon) + 1;
- 
--  for (list<MapTile*>::iterator it = tiles.begin(); it != tiles.end(); it++) {
-+  for (std::list<MapTile*>::iterator it = tiles.begin(); it != tiles.end(); it++) {
-     MapTile *tile = *it;
- 
-     // remove old tiles
-@@ -246,7 +246,7 @@
-          tile->c.lon < min_lon - CACHE_LIMIT || 
-          tile->c.lon > max_lon + CACHE_LIMIT) {
-  
--      list<MapTile*>::iterator tmp = it; tmp++;
-+      std::list<MapTile*>::iterator tmp = it; tmp++;
-       if ( tile->tex ) {
-         glDeleteTextures( 1, &tile->texture_handle );
-       }
-diff -wbBur Atlas-0.3.1/src/MapBrowser.hxx Atlas-0.3.1.my/src/MapBrowser.hxx
---- Atlas-0.3.1/src/MapBrowser.hxx	2006-10-28 16:28:32.000000000 +0000
-+++ Atlas-0.3.1.my/src/MapBrowser.hxx	2009-03-11 16:33:30.000000000 +0000
-@@ -27,7 +27,7 @@
- #include "FlightTrack.hxx"
- #include "Projection.hxx"
- #include <simgear/compiler.h>
--#include SG_GL_H
-+#include <GL/gl.h>
- #include <math.h>
- #include <list>
- #include <map>
-@@ -113,9 +113,9 @@
-     }
-   };
- 
--  typedef map<Coord, MapTile*, TileLess> TileTable;
-+  typedef std::map<Coord, MapTile*, TileLess> TileTable;
- 
--  list<MapTile*> tiles;
-+  std::list<MapTile*> tiles;
-   TileTable tiletable;
- 
-   char mpath[512];
-diff -wbBur Atlas-0.3.1/src/MapMaker.cxx Atlas-0.3.1.my/src/MapMaker.cxx
---- Atlas-0.3.1/src/MapMaker.cxx	2005-09-29 19:18:01.000000000 +0000
-+++ Atlas-0.3.1.my/src/MapMaker.cxx	2009-03-11 16:39:09.000000000 +0000
-@@ -32,6 +32,8 @@
- #include <sys/stat.h>
- #include <plib/ul.h>
- 
-+#include <iostream>
-+
- #include "MapMaker.hxx"
- /*#include <simgear/magvar/magvar.hxx>*/
- 
-@@ -626,7 +628,7 @@
- }
- 
- int MapMaker::process_binary_file( char *tile_name, sgVec3 xyz ) {
--  //cout << "tile name = " << tile_name << '\n';
-+  //std::cout << "tile name = " << tile_name << '\n';
-   
-   //float cr;               // reference point (gbs)
-   sgVec3 gbs, tmp;
-@@ -653,8 +655,8 @@
- 
-   /* convert point_list of wgs84 nodes to a list of points transformed
-      into the maps local coordinate system */
--  const point_list wgs84_nodes = tile.get_wgs84_nodes();
--  for ( point_list::const_iterator node = wgs84_nodes . begin(); 
-+  const std::vector< SGVec3<double> > wgs84_nodes = tile.get_wgs84_nodes();
-+  for ( std::vector< SGVec3<double> >::const_iterator node = wgs84_nodes . begin(); 
- 	node != wgs84_nodes . end();
- 	node++ ) {
- 
-@@ -674,8 +676,8 @@
-   }
- 
-   // same as above for normals
--  const point_list m_norms = tile.get_normals();
--  for ( point_list::const_iterator normal = m_norms.begin(); 
-+  const std::vector< SGVec3<float> > m_norms = tile.get_normals();
-+  for ( std::vector< SGVec3<float> >::const_iterator normal = m_norms.begin(); 
- 	normal != m_norms.end();
- 	normal++ ) {
-     // Make a new normal
-@@ -760,8 +762,8 @@
-   }
- 	
-   if(0) {
--    cout << "Node_list sizes are nodes: " << wgs84_nodes.size() << " -- normals: " << m_norms.size() << '\n'; 
--    cout << "Group_list sizes are tris: " << tris.size() << " -- fans: " << fans.size() << " -- strips: " << strips.size() << '\n';
-+    std::cout << "Node_list sizes are nodes: " << wgs84_nodes.size() << " -- normals: " << m_norms.size() << '\n'; 
-+    std::cout << "Group_list sizes are tris: " << tris.size() << " -- fans: " << fans.size() << " -- strips: " << strips.size() << '\n';
-   } 
- 
-   for (i = 0; i < v.size(); i++) {
-diff -wbBur Atlas-0.3.1/src/MapMaker.hxx Atlas-0.3.1.my/src/MapMaker.hxx
---- Atlas-0.3.1/src/MapMaker.hxx	2005-02-26 18:40:36.000000000 +0000
-+++ Atlas-0.3.1.my/src/MapMaker.hxx	2009-03-11 16:33:30.000000000 +0000
-@@ -31,14 +31,14 @@
- #include <vector>
- #include <list>
- #include <map>
--#include STL_STRING
-+#include <string>
- 
- #include "Output.hxx"
- #include "Overlays.hxx"
- #include "Geodesy.hxx"
- 
--SG_USING_STD(vector);
--SG_USING_STD(string);
-+#include <vector>
-+#include <string>
- 
- // Utility function that I needed to put somewhere - this probably isn't the best place for it.
- // Appends a path separator to a directory path if not present.
-diff -wbBur Atlas-0.3.1/src/MapPS.cxx Atlas-0.3.1.my/src/MapPS.cxx
---- Atlas-0.3.1/src/MapPS.cxx	2005-09-29 19:18:01.000000000 +0000
-+++ Atlas-0.3.1.my/src/MapPS.cxx	2009-03-11 16:40:31.000000000 +0000
-@@ -39,8 +39,9 @@
- #include <plib/ul.h>
- #include "Scenery.hxx"
- 
--SG_USING_STD(vector);
--SG_USING_STD(string);
-+#include <vector>
-+#include <string>
-+#include <iostream>
- 
- typedef vector<string> string_list;
- 
-@@ -149,7 +150,7 @@
-     scenerypath = new char[max_path_length + 256];
-     scenery_pos = 0;
-   } else {
--    cout << "No scenery paths could be found.  You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n";
-+    std::cout << "No scenery paths could be found.  You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n";
-     exit(-1);
-   }
- 
-diff -wbBur Atlas-0.3.1/src/OutputGL.hxx Atlas-0.3.1.my/src/OutputGL.hxx
---- Atlas-0.3.1/src/OutputGL.hxx	2005-02-26 18:40:37.000000000 +0000
-+++ Atlas-0.3.1.my/src/OutputGL.hxx	2009-03-11 16:33:30.000000000 +0000
-@@ -2,7 +2,7 @@
- #define __OUTPUTGL_H__
- 
- #include <simgear/compiler.h>
--#include SG_GLUT_H
-+#include <GL/glut.h>
- #include <plib/fnt.h>
- #include <plib/pu.h>
- #include "Output.hxx"
-diff -wbBur Atlas-0.3.1/src/Overlays.cxx Atlas-0.3.1.my/src/Overlays.cxx
---- Atlas-0.3.1/src/Overlays.cxx	2006-10-26 11:56:25.000000000 +0000
-+++ Atlas-0.3.1.my/src/Overlays.cxx	2009-03-11 16:33:33.000000000 +0000
-@@ -27,7 +27,7 @@
- #include "Overlays.hxx"
- #include "Geodesy.hxx"
- 
--SG_USING_STD(map);
-+#include <map>
- 
- #ifdef _MSC_VER
- 
-@@ -65,8 +65,10 @@
- bool Overlays::airports_loaded = false;
- bool Overlays::navaids_loaded  = false;
- bool Overlays::fixes_loaded    = false;
--vector<Overlays::ARP*> Overlays::airports;
--vector<Overlays::NAV*> Overlays::navaids;
-+std::vector<Overlays::ARP*> Overlays::airports;
-+std::vector<Overlays::NAV*> Overlays::navaids;
-+
-+using namespace std;
- 
- const float Overlays::airport_color1[4] = {0.439, 0.271, 0.420, 0.7}; 
- const float Overlays::airport_color2[4] = {0.824, 0.863, 0.824, 0.7};
-diff -wbBur Atlas-0.3.1/src/Overlays.hxx Atlas-0.3.1.my/src/Overlays.hxx
---- Atlas-0.3.1/src/Overlays.hxx	2005-01-10 13:15:53.000000000 +0000
-+++ Atlas-0.3.1.my/src/Overlays.hxx	2009-03-11 16:33:30.000000000 +0000
-@@ -121,7 +121,7 @@
-   struct ARP {
-     char name[64], id[5];
-     float lat, lon;
--    list<RWY*> rwys;
-+    std::list<RWY*> rwys;
-   };
- 
-   enum NavType { NAV_VOR, NAV_DME, NAV_NDB, NAV_ILS, NAV_FIX };
-@@ -142,8 +142,8 @@
- 
- protected:
- 
--  static vector<ARP*> airports;
--  static vector<NAV*> navaids;
-+  static std::vector<ARP*> airports;
-+  static std::vector<NAV*> navaids;
-   static bool airports_loaded, navaids_loaded, fixes_loaded;
-   static const float dummy_normals[][3];
- 
-diff -wbBur Atlas-0.3.1/src/Scenery.cxx Atlas-0.3.1.my/src/Scenery.cxx
---- Atlas-0.3.1/src/Scenery.cxx	2005-02-26 18:39:14.000000000 +0000
-+++ Atlas-0.3.1.my/src/Scenery.cxx	2009-03-11 16:33:33.000000000 +0000
-@@ -3,8 +3,8 @@
- 
- #include "MapMaker.hxx"
- 
--SG_USING_STD(vector);
--SG_USING_STD(string);
-+#include <vector>
-+#include <string>
- 
- typedef vector<string> string_list;
- 
-diff -wbBur Atlas-0.3.1/src/buildmaps.sh Atlas-0.3.1.my/src/buildmaps.sh
---- Atlas-0.3.1/src/buildmaps.sh	2006-10-29 14:35:49.000000000 +0000
-+++ Atlas-0.3.1.my/src/buildmaps.sh	2009-03-11 16:17:43.000000000 +0000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--ROOT=NONE/lib/FlightGear/Scenery
-+ROOT=/usr/lib/FlightGear/Scenery
- OUTPUTDIR=./maps
- 
- mkdir -p $OUTPUTDIR
-diff -wbBur Atlas-0.3.1/src/fg_mkdir.cxx Atlas-0.3.1.my/src/fg_mkdir.cxx
---- Atlas-0.3.1/src/fg_mkdir.cxx	2005-01-28 12:54:12.000000000 +0000
-+++ Atlas-0.3.1.my/src/fg_mkdir.cxx	2009-03-11 16:40:00.000000000 +0000
-@@ -28,6 +28,8 @@
- 
- #include <simgear/compiler.h>
- 
-+#include <cstdlib>
-+
- #ifdef _MSC_VER
-   #include <direct.h>
-   #include <io.h>
diff --git a/community/freemat/freemat-gcc-4.3.0.patch b/community/freemat/freemat-gcc-4.3.0.patch
deleted file mode 100644
index 40247177c..000000000
--- a/community/freemat/freemat-gcc-4.3.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -wbBur FreeMat-3.6/libs/libFreeMat/Malloc.cpp FreeMat-3.6.my/libs/libFreeMat/Malloc.cpp
---- FreeMat-3.6/libs/libFreeMat/Malloc.cpp	2008-03-14 18:43:10.000000000 +0300
-+++ FreeMat-3.6.my/libs/libFreeMat/Malloc.cpp	2008-04-25 21:29:19.000000000 +0400
-@@ -21,6 +21,7 @@
- #include "Exception.hpp"
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- 
- 
- void* Malloc(int count) {
-diff -wbBur FreeMat-3.6/libs/libFreeMat/Token.cpp FreeMat-3.6.my/libs/libFreeMat/Token.cpp
---- FreeMat-3.6/libs/libFreeMat/Token.cpp	2008-03-14 18:43:10.000000000 +0300
-+++ FreeMat-3.6.my/libs/libFreeMat/Token.cpp	2008-04-25 21:31:33.000000000 +0400
-@@ -2,6 +2,7 @@
- #include "Serialize.hpp"
- #include <iostream>
- #include <errno.h>
-+#include <limits.h>
- 
- // These must appear as sequential token numbers
- string fm_reserved[22] = {
-diff -wbBur FreeMat-3.6/libs/libFreeMat/Types.hpp FreeMat-3.6.my/libs/libFreeMat/Types.hpp
---- FreeMat-3.6/libs/libFreeMat/Types.hpp	2008-03-14 18:43:10.000000000 +0300
-+++ FreeMat-3.6.my/libs/libFreeMat/Types.hpp	2008-04-25 21:28:26.000000000 +0400
-@@ -20,7 +20,11 @@
- #ifndef __Types_hpp__
- #define __Types_hpp__
- 
-+#include <algorithm>
- #include <string>
-+#include <string.h>
-+using namespace std;
-+
- #include <QVector>
- #include <QtGlobal>
- #include <QList>
diff --git a/community/freemat/freemat-gcc-4.5.0.patch b/community/freemat/freemat-gcc-4.5.0.patch
deleted file mode 100644
index 08f644e50..000000000
--- a/community/freemat/freemat-gcc-4.5.0.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Array.cpp FreeMat-4.0.1-Source.my//libs/libFreeMat/Array.cpp
---- FreeMat-4.0.1-Source/libs/libFreeMat/Array.cpp	2009-10-09 06:24:20.000000000 +0000
-+++ FreeMat-4.0.1-Source.my//libs/libFreeMat/Array.cpp	2010-12-27 12:38:46.000000000 +0000
-@@ -465,7 +465,7 @@
- 
- void Array::set(const QString& field, ArrayVector& data) {
-   if (isEmpty() && m_type.Class != Struct)
--    *this = Array::Array(Struct);
-+    *this = Array(Struct);
-   if (m_type.Class != Struct) throw Exception("Unsupported type for A.field=B");
-   StructArray &rp(structPtr());
-   if (isEmpty()) 
-diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Math.cpp FreeMat-4.0.1-Source.my//libs/libFreeMat/Math.cpp
---- FreeMat-4.0.1-Source/libs/libFreeMat/Math.cpp	2009-10-09 06:24:22.000000000 +0000
-+++ FreeMat-4.0.1-Source.my//libs/libFreeMat/Math.cpp	2010-12-27 12:42:34.000000000 +0000
-@@ -1590,9 +1590,9 @@
- 
- Array Not(const Array& A) {
-   if (A.isScalar())
--    return Array::Array(!A.toClass(Bool).constRealScalar<bool>());
-+    return Array(!A.toClass(Bool).constRealScalar<bool>());
-   const Array &Abool(A.toClass(Bool));
--  return Array::Array(Apply(Abool.constReal<bool>(),notfunc));
-+  return Array(Apply(Abool.constReal<bool>(),notfunc));
- }
- 
- Array Plus(const Array& A) {
-diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Operators.hpp FreeMat-4.0.1-Source.my//libs/libFreeMat/Operators.hpp
---- FreeMat-4.0.1-Source/libs/libFreeMat/Operators.hpp	2009-10-09 06:24:22.000000000 +0000
-+++ FreeMat-4.0.1-Source.my//libs/libFreeMat/Operators.hpp	2010-12-27 14:04:11.000000000 +0000
-@@ -142,11 +142,11 @@
-   if (!Bcast.isScalar()) Bcast = Bcast.asDenseArray();
-   if (Acast.isScalar() && Bcast.isScalar()) {
-     if (Acast.allReal() && Bcast.allReal()) {
--      F = Array::Array(Op::func(Acast.constRealScalar<T>(),
-+      F = Array(Op::func(Acast.constRealScalar<T>(),
- 				Bcast.constRealScalar<T>()));
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(T(0),T(0));
-+      F = Array(T(0),T(0));
-       Op::func(Acast.constRealScalar<T>(),
- 	       Acast.constImagScalar<T>(),
- 	       Bcast.constRealScalar<T>(),
-@@ -155,7 +155,7 @@
-     }
-   } else if (Acast.isScalar()) {
-     if (Acast.allReal() && Bcast.allReal()) {
--      F = Array::Array(Tclass,Bcast.dimensions());
-+      F = Array(Tclass,Bcast.dimensions());
-       T* ret = F.real<T>().data();
-       const T& Ap = Acast.constRealScalar<T>();
-       const T* Bp = Bcast.constReal<T>().constData();
-@@ -163,7 +163,7 @@
-       for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap,Bp[i]);
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Tclass,Bcast.dimensions());
-+      F = Array(Tclass,Bcast.dimensions());
-       T* Cr = F.real<T>().data();
-       T* Ci = F.imag<T>().data();
-       const T& Ar = Acast.constRealScalar<T>();
-@@ -175,7 +175,7 @@
-     }
-   } else if (Bcast.isScalar()) {
-     if (Bcast.allReal() && Acast.allReal()) {
--      F = Array::Array(Tclass,Acast.dimensions());
-+      F = Array(Tclass,Acast.dimensions());
-       T* ret = F.real<T>().data();
-       const T* Ap = Acast.constReal<T>().constData();
-       const T& Bp = Bcast.constRealScalar<T>();
-@@ -183,7 +183,7 @@
-       for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap[i],Bp);
-     } else { 
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Tclass,Acast.dimensions());
-+      F = Array(Tclass,Acast.dimensions());
-       T* Cr = F.real<T>().data();
-       T* Ci = F.imag<T>().data();
-       const T* Ar = Acast.constReal<T>().constData();
-@@ -197,7 +197,7 @@
-     if (Acast.dimensions() != Bcast.dimensions())
-       throw Exception("size mismatch in arguments to binary operator");
-     if (Bcast.allReal() && Acast.allReal()) {
--      F = Array::Array(Tclass,Acast.dimensions());
-+      F = Array(Tclass,Acast.dimensions());
-       T* ret = F.real<T>().data();
-       const T* Ap = Acast.constReal<T>().constData();
-       const T* Bp = Bcast.constReal<T>().constData();
-@@ -205,7 +205,7 @@
-       for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap[i],Bp[i]);
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Tclass,Acast.dimensions());
-+      F = Array(Tclass,Acast.dimensions());
-       T* Cr = F.real<T>().data();
-       T* Ci = F.imag<T>().data();
-       const T* Ar = Acast.constReal<T>().constData();
-@@ -328,17 +328,17 @@
-   if (!Acast.isScalar()) Acast = Acast.asDenseArray();
-   if (!Bcast.isScalar()) Bcast = Bcast.asDenseArray();
-   if (Acast.isScalar() && Bcast.isScalar()) {
--    F = Array::Array(Op::func(Acast.constRealScalar<T>(),
-+    F = Array(Op::func(Acast.constRealScalar<T>(),
- 			      Bcast.constRealScalar<T>()));
-   } else if (Acast.isScalar()) {
--    F = Array::Array(Bool,Bcast.dimensions());
-+    F = Array(Bool,Bcast.dimensions());
-     bool* ret = F.real<bool>().data();
-     const T& Ap = Acast.constRealScalar<T>();
-     const T* Bp = Bcast.constReal<T>().constData();
-     uint64 q = uint64(Bcast.length());
-     for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap,Bp[i]);
-   } else if (Bcast.isScalar()) {
--    F = Array::Array(Bool,Acast.dimensions());
-+    F = Array(Bool,Acast.dimensions());
-     bool* ret = F.real<bool>().data();
-     const T* Ap = Acast.constReal<T>().constData();
-     const T& Bp = Bcast.constRealScalar<T>();
-@@ -347,7 +347,7 @@
-   } else {
-     if (Acast.dimensions() != Bcast.dimensions())
-       throw Exception("size mismatch in arguments to binary operator");
--    F = Array::Array(Bool,Acast.dimensions());
-+    F = Array(Bool,Acast.dimensions());
-     bool* ret = F.real<bool>().data();
-     const T* Ap = Acast.constReal<T>().constData();
-     const T* Bp = Bcast.constReal<T>().constData();
-@@ -395,18 +395,18 @@
-   if (!Bcast.isScalar()) Bcast = Bcast.asDenseArray();
-   if (Acast.isScalar() && Bcast.isScalar()) {
-     if (Acast.allReal() && Bcast.allReal()) {
--      F = Array::Array(Op::func(Acast.constRealScalar<T>(),
-+      F = Array(Op::func(Acast.constRealScalar<T>(),
- 				Bcast.constRealScalar<T>()));
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Op::func(Acast.constRealScalar<T>(),
-+      F = Array(Op::func(Acast.constRealScalar<T>(),
- 				Acast.constImagScalar<T>(),
- 				Bcast.constRealScalar<T>(),
- 				Bcast.constImagScalar<T>()));
-     }
-   } else if (Acast.isScalar()) {
-     if (Acast.allReal() && Bcast.allReal()) {
--      F = Array::Array(Bool,Bcast.dimensions());
-+      F = Array(Bool,Bcast.dimensions());
-       bool* ret = F.real<bool>().data();
-       const T& Ap = Acast.constRealScalar<T>();
-       const T* Bp = Bcast.constReal<T>().constData();
-@@ -414,7 +414,7 @@
-       for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap,Bp[i]);
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Bool,Bcast.dimensions());
-+      F = Array(Bool,Bcast.dimensions());
-       bool* ret = F.real<bool>().data();
-       const T& Ar = Acast.constRealScalar<T>();
-       const T& Ai = Acast.constImagScalar<T>();
-@@ -425,7 +425,7 @@
-     }
-   } else if (Bcast.isScalar()) {
-     if (Bcast.allReal() && Acast.allReal()) {
--      F = Array::Array(Bool,Acast.dimensions());
-+      F = Array(Bool,Acast.dimensions());
-       bool* ret = F.real<bool>().data();
-       const T* Ap = Acast.constReal<T>().constData();
-       const T& Bp = Bcast.constRealScalar<T>();
-@@ -433,7 +433,7 @@
-       for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap[i],Bp);
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Bool,Acast.dimensions());
-+      F = Array(Bool,Acast.dimensions());
-       bool* ret = F.real<bool>().data();
-       const T* Ar = Acast.constReal<T>().constData();
-       const T* Ai = Acast.constImag<T>().constData();
-@@ -446,7 +446,7 @@
-     if (Acast.dimensions() != Bcast.dimensions())
-       throw Exception("size mismatch in arguments to binary operator");
-     if (Bcast.allReal() && Acast.allReal()) {
--      F = Array::Array(Bool,Acast.dimensions());
-+      F = Array(Bool,Acast.dimensions());
-       bool* ret = F.real<bool>().data();
-       const T* Ap = Acast.constReal<T>().constData();
-       const T* Bp = Bcast.constReal<T>().constData();
-@@ -454,7 +454,7 @@
-       for (uint64 i=0;i<q;i++) ret[i] = Op::func(Ap[i],Bp[i]);
-     } else {
-       Acast.forceComplex(); Bcast.forceComplex();
--      F = Array::Array(Bool,Acast.dimensions());
-+      F = Array(Bool,Acast.dimensions());
-       bool* ret = F.real<bool>().data();
-       const T* Ar = Acast.constReal<T>().constData();
-       const T* Ai = Acast.constImag<T>().constData();
-@@ -533,9 +533,9 @@
-   if (!Acast.isScalar()) Acast = Acast.asDenseArray();
-   if (Acast.isScalar()) {
-     if (Acast.allReal()) {
--      F = Array::Array(Op::func(Acast.constRealScalar<T>()));
-+      F = Array(Op::func(Acast.constRealScalar<T>()));
-     } else {
--      F = Array::Array(T(0),T(0));
-+      F = Array(T(0),T(0));
-       Op::func(Acast.constRealScalar<T>(),
- 	       Acast.constImagScalar<T>(),
- 	       F.realScalar<T>(),F.imagScalar<T>());
diff --git a/community/freemat/freemat-qt46.patch b/community/freemat/freemat-qt46.patch
deleted file mode 100644
index aa92dc18c..000000000
--- a/community/freemat/freemat-qt46.patch
+++ /dev/null
@@ -1,2088 +0,0 @@
-diff -wbBur FreeMat-4.0.1-Source/libs/libCore/helpwidget.moc.cpp FreeMat-4.0.1-Source.new/libs/libCore/helpwidget.moc.cpp
---- FreeMat-4.0.1-Source/libs/libCore/helpwidget.moc.cpp	2009-10-09 06:23:29.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libCore/helpwidget.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'helpwidget.hpp'
- **
--** Created: Thu Oct 8 21:52:25 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "helpwidget.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'helpwidget.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_HelpSearcher[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       14,   13,   13,   13, 0x08,
-@@ -43,9 +45,13 @@
-       qt_meta_data_HelpSearcher, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HelpSearcher::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HelpSearcher::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HelpSearcher::qt_metacast(const char *_clname)
-@@ -73,13 +79,15 @@
- static const uint qt_meta_data_HelpWidget[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -93,9 +101,13 @@
-       qt_meta_data_HelpWidget, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HelpWidget::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HelpWidget::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HelpWidget::qt_metacast(const char *_clname)
-@@ -116,13 +128,15 @@
- static const uint qt_meta_data_HelpWindow[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       6,   12, // methods
-+       6,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       12,   11,   11,   11, 0x05,
-@@ -150,9 +164,13 @@
-       qt_meta_data_HelpWindow, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HelpWindow::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HelpWindow::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HelpWindow::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libCore/XML.moc.cpp FreeMat-4.0.1-Source.new/libs/libCore/XML.moc.cpp
---- FreeMat-4.0.1-Source/libs/libCore/XML.moc.cpp	2009-10-09 06:23:28.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libCore/XML.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'XML.hpp'
- **
--** Created: Thu Oct 8 21:52:25 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "XML.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'XML.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_URLRetriever[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       21,   14,   13,   13, 0x0a,
-@@ -43,9 +45,13 @@
-       qt_meta_data_URLRetriever, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &URLRetriever::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *URLRetriever::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *URLRetriever::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/DebugStream.moc.cpp FreeMat-4.0.1-Source.new/libs/libFreeMat/DebugStream.moc.cpp
---- FreeMat-4.0.1-Source/libs/libFreeMat/DebugStream.moc.cpp	2009-10-09 06:24:22.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libFreeMat/DebugStream.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'DebugStream.hpp'
- **
--** Created: Thu Oct 8 21:51:54 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "DebugStream.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'DebugStream.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_DebugStream[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       17,   13,   12,   12, 0x05,
-@@ -43,9 +45,13 @@
-       qt_meta_data_DebugStream, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &DebugStream::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *DebugStream::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *DebugStream::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Intrepreter.moc.cpp FreeMat-4.0.1-Source.new/libs/libFreeMat/Intrepreter.moc.cpp
---- FreeMat-4.0.1-Source/libs/libFreeMat/Intrepreter.moc.cpp	2009-10-09 06:24:21.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libFreeMat/Intrepreter.moc.cpp	2010-03-03 13:24:53.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'Interpreter.hpp'
- **
--** Created: Thu Oct 8 21:51:55 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:24:53 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "Interpreter.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'Interpreter.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_Interpreter[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      20,   12, // methods
-+      20,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+      16,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       13,   12,   12,   12, 0x05,
-@@ -77,9 +79,13 @@
-       qt_meta_data_Interpreter, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &Interpreter::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *Interpreter::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *Interpreter::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/GLWindow.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/GLWindow.moc.cpp
---- FreeMat-4.0.1-Source/libs/libGraphics/GLWindow.moc.cpp	2009-10-09 06:24:11.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libGraphics/GLWindow.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'GLWindow.hpp'
- **
--** Created: Thu Oct 8 21:52:04 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "GLWindow.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'GLWindow.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_GLWidget[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -40,9 +42,13 @@
-       qt_meta_data_GLWidget, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &GLWidget::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *GLWidget::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *GLWidget::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/HandleMultiEdit.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/HandleMultiEdit.moc.cpp
---- FreeMat-4.0.1-Source/libs/libGraphics/HandleMultiEdit.moc.cpp	2009-10-09 06:24:11.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libGraphics/HandleMultiEdit.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'HandleMultiEdit.hpp'
- **
--** Created: Thu Oct 8 21:52:05 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "HandleMultiEdit.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'HandleMultiEdit.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_HandleMultiEdit[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       17,   16,   16,   16, 0x05,
-@@ -43,9 +45,13 @@
-       qt_meta_data_HandleMultiEdit, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HandleMultiEdit::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HandleMultiEdit::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HandleMultiEdit::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/HandleUIControl.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/HandleUIControl.moc.cpp
---- FreeMat-4.0.1-Source/libs/libGraphics/HandleUIControl.moc.cpp	2009-10-09 06:24:11.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libGraphics/HandleUIControl.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'HandleUIControl.hpp'
- **
--** Created: Thu Oct 8 21:52:05 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "HandleUIControl.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'HandleUIControl.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_HandleUIControl[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       17,   16,   16,   16, 0x08,
-@@ -43,9 +45,13 @@
-       qt_meta_data_HandleUIControl, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HandleUIControl::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HandleUIControl::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HandleUIControl::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/HandleWindow.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/HandleWindow.moc.cpp
---- FreeMat-4.0.1-Source/libs/libGraphics/HandleWindow.moc.cpp	2009-10-09 06:24:11.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libGraphics/HandleWindow.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'HandleWindow.hpp'
- **
--** Created: Thu Oct 8 21:52:05 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "HandleWindow.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'HandleWindow.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_HandleWindow[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       6,   12, // methods
-+       6,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       14,   13,   13,   13, 0x0a,
-@@ -50,9 +52,13 @@
-       qt_meta_data_HandleWindow, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HandleWindow::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HandleWindow::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HandleWindow::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/DataTable.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/DataTable.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/DataTable.moc.cpp	2009-10-09 06:24:19.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/DataTable.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'DataTable.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "DataTable.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'DataTable.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_DataTable[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -40,9 +42,13 @@
-       qt_meta_data_DataTable, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &DataTable::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *DataTable::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *DataTable::qt_metacast(const char *_clname)
-@@ -63,13 +69,15 @@
- static const uint qt_meta_data_DataView[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -83,9 +91,13 @@
-       qt_meta_data_DataView, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &DataView::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *DataView::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *DataView::qt_metacast(const char *_clname)
-@@ -106,13 +118,15 @@
- static const uint qt_meta_data_DataHeaderView[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       16,   15,   15,   15, 0x08,
-@@ -129,9 +143,13 @@
-       qt_meta_data_DataHeaderView, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &DataHeaderView::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *DataHeaderView::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *DataHeaderView::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/DebugWin.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/DebugWin.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/DebugWin.moc.cpp	2009-10-09 06:24:18.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/DebugWin.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'DebugWin.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "DebugWin.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'DebugWin.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_DebugWin[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       3,   12, // methods
-+       3,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       12,   10,    9,    9, 0x09,
-@@ -46,9 +48,13 @@
-       qt_meta_data_DebugWin, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &DebugWin::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *DebugWin::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *DebugWin::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/Editor.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/Editor.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/Editor.moc.cpp	2009-10-09 06:24:12.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/Editor.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'Editor.hpp'
- **
--** Created: Thu Oct 8 21:52:14 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "Editor.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'Editor.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_FMFindDialog[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       2,   12, // methods
-+       2,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       39,   14,   13,   13, 0x05,
-@@ -47,9 +49,13 @@
-       qt_meta_data_FMFindDialog, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMFindDialog::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMFindDialog::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMFindDialog::qt_metacast(const char *_clname)
-@@ -85,13 +91,15 @@
- static const uint qt_meta_data_FMReplaceDialog[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       6,   12, // methods
-+       6,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       42,   17,   16,   16, 0x05,
-@@ -120,9 +128,13 @@
-       qt_meta_data_FMReplaceDialog, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMReplaceDialog::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMReplaceDialog::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMReplaceDialog::qt_metacast(const char *_clname)
-@@ -176,13 +188,15 @@
- static const uint qt_meta_data_FMTextEdit[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       6,   12, // methods
-+       6,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       12,   11,   11,   11, 0x05,
-@@ -210,9 +224,13 @@
-       qt_meta_data_FMTextEdit, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMTextEdit::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMTextEdit::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMTextEdit::qt_metacast(const char *_clname)
-@@ -264,13 +282,15 @@
- static const uint qt_meta_data_FMIndent[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       2,   12, // methods
-+       2,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       10,    9,    9,    9, 0x08,
-@@ -288,9 +308,13 @@
-       qt_meta_data_FMIndent, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMIndent::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMIndent::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMIndent::qt_metacast(const char *_clname)
-@@ -319,13 +343,15 @@
- static const uint qt_meta_data_BreakPointIndicator[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -339,9 +365,13 @@
-       qt_meta_data_BreakPointIndicator, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &BreakPointIndicator::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *BreakPointIndicator::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *BreakPointIndicator::qt_metacast(const char *_clname)
-@@ -362,13 +392,15 @@
- static const uint qt_meta_data_FMLineNumber[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -382,9 +414,13 @@
-       qt_meta_data_FMLineNumber, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMLineNumber::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMLineNumber::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMLineNumber::qt_metacast(const char *_clname)
-@@ -405,13 +441,15 @@
- static const uint qt_meta_data_FMEditPane[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       23,   12,   11,   11, 0x05,
-@@ -428,9 +466,13 @@
-       qt_meta_data_FMEditPane, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMEditPane::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMEditPane::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMEditPane::qt_metacast(const char *_clname)
-@@ -465,13 +507,15 @@
- static const uint qt_meta_data_FMIndentConf[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       14,   13,   13,   13, 0x08,
-@@ -488,9 +532,13 @@
-       qt_meta_data_FMIndentConf, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMIndentConf::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMIndentConf::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMIndentConf::qt_metacast(const char *_clname)
-@@ -518,13 +566,15 @@
- static const uint qt_meta_data_FMSynLightConf[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       5,   12, // methods
-+       5,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       16,   15,   15,   15, 0x08,
-@@ -547,9 +597,13 @@
-       qt_meta_data_FMSynLightConf, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMSynLightConf::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMSynLightConf::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMSynLightConf::qt_metacast(const char *_clname)
-@@ -581,13 +635,15 @@
- static const uint qt_meta_data_FMEditor[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      46,   12, // methods
-+      46,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       10,    9,    9,    9, 0x05,
-@@ -675,9 +731,13 @@
-       qt_meta_data_FMEditor, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMEditor::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMEditor::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMEditor::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/FileTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/FileTool.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/FileTool.moc.cpp	2009-10-09 06:24:20.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/FileTool.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'FileTool.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "FileTool.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'FileTool.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_FileTool[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       3,   12, // methods
-+       3,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       12,   10,    9,    9, 0x05,
-@@ -49,9 +51,13 @@
-       qt_meta_data_FileTool, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FileTool::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FileTool::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FileTool::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/findform.ui.h FreeMat-4.0.1-Source.new/libs/libXP/findform.ui.h
---- FreeMat-4.0.1-Source/libs/libXP/findform.ui.h	2009-10-09 06:24:12.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/findform.ui.h	2010-03-03 13:17:50.000000000 +0000
-@@ -1,10 +1,10 @@
- /********************************************************************************
--** Form generated from reading ui file 'findform.ui'
-+** Form generated from reading UI file 'findform.ui'
- **
--** Created: Thu Oct 8 21:52:13 2009
--**      by: Qt User Interface Compiler version 4.5.2
-+** Created: Wed Mar 3 13:17:50 2010
-+**      by: Qt User Interface Compiler version 4.6.2
- **
--** WARNING! All changes made in this file will be lost when recompiling ui file!
-+** WARNING! All changes made in this file will be lost when recompiling UI file!
- ********************************************************************************/
- 
- #ifndef FINDFORM_H
-@@ -69,7 +69,7 @@
- #ifndef Q_OS_MAC
-         vboxLayout->setSpacing(6);
- #endif
--        vboxLayout->setMargin(0);
-+        vboxLayout->setContentsMargins(0, 0, 0, 0);
-         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-         vboxLayout->setContentsMargins(0, 0, 0, 0);
-         hboxLayout = new QHBoxLayout();
-@@ -77,7 +77,7 @@
-         hboxLayout->setSpacing(6);
- #endif
- #ifndef Q_OS_MAC
--        hboxLayout->setMargin(0);
-+        hboxLayout->setContentsMargins(0, 0, 0, 0);
- #endif
-         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
-         label = new QLabel(layoutWidget);
-@@ -119,7 +119,7 @@
- #ifndef Q_OS_MAC
-         vboxLayout1->setSpacing(6);
- #endif
--        vboxLayout1->setMargin(0);
-+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
-         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
-         vboxLayout1->setContentsMargins(0, 0, 0, 0);
-         cbSensitive = new QCheckBox(layoutWidget1);
-@@ -149,7 +149,7 @@
- #ifndef Q_OS_MAC
-         vboxLayout2->setSpacing(6);
- #endif
--        vboxLayout2->setMargin(0);
-+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
-         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
-         vboxLayout2->setContentsMargins(0, 0, 0, 0);
-         btFind = new QPushButton(layoutWidget2);
-@@ -191,7 +191,6 @@
-         lbStatus->setText(QString());
-         btFind->setText(QApplication::translate("FMFindDialog", "Find", 0, QApplication::UnicodeUTF8));
-         btClose->setText(QApplication::translate("FMFindDialog", "Close", 0, QApplication::UnicodeUTF8));
--        Q_UNUSED(FMFindDialog);
-     } // retranslateUi
- 
- };
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/FMFontDialog.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/FMFontDialog.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/FMFontDialog.moc.cpp	2009-10-09 06:24:20.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/FMFontDialog.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'FMFontDialog.hpp'
- **
--** Created: Thu Oct 8 21:52:14 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "FMFontDialog.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'FMFontDialog.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_FMFontDialog[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       3,   12, // methods
-+       3,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       19,   14,   13,   13, 0x08,
-@@ -46,9 +48,13 @@
-       qt_meta_data_FMFontDialog, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FMFontDialog::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FMFontDialog::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FMFontDialog::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/fontform.ui.h FreeMat-4.0.1-Source.new/libs/libXP/fontform.ui.h
---- FreeMat-4.0.1-Source/libs/libXP/fontform.ui.h	2009-10-09 06:24:19.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/fontform.ui.h	2010-03-03 13:17:50.000000000 +0000
-@@ -1,10 +1,10 @@
- /********************************************************************************
--** Form generated from reading ui file 'fontform.ui'
-+** Form generated from reading UI file 'fontform.ui'
- **
--** Created: Thu Oct 8 21:52:13 2009
--**      by: Qt User Interface Compiler version 4.5.2
-+** Created: Wed Mar 3 13:17:50 2010
-+**      by: Qt User Interface Compiler version 4.6.2
- **
--** WARNING! All changes made in this file will be lost when recompiling ui file!
-+** WARNING! All changes made in this file will be lost when recompiling UI file!
- ********************************************************************************/
- 
- #ifndef FONTFORM_H
-@@ -80,7 +80,6 @@
-         label_2->setText(QApplication::translate("FixedFontDialog", "Size", 0, QApplication::UnicodeUTF8));
-         groupBox->setTitle(QApplication::translate("FixedFontDialog", "Sample", 0, QApplication::UnicodeUTF8));
-         sample->setText(QApplication::translate("FixedFontDialog", "AaBbZz123", 0, QApplication::UnicodeUTF8));
--        Q_UNUSED(FixedFontDialog);
-     } // retranslateUi
- 
- };
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/highlighter.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/highlighter.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/highlighter.moc.cpp	2009-10-09 06:24:19.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/highlighter.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'highlighter.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "highlighter.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'highlighter.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_Highlighter[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -40,9 +42,13 @@
-       qt_meta_data_Highlighter, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &Highlighter::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *Highlighter::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *Highlighter::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/HistoryWidget.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/HistoryWidget.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/HistoryWidget.moc.cpp	2009-10-09 06:24:20.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/HistoryWidget.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'HistoryWidget.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "HistoryWidget.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'HistoryWidget.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_HistoryWidget[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       8,   12, // methods
-+       8,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       17,   15,   14,   14, 0x05,
-@@ -56,9 +58,13 @@
-       qt_meta_data_HistoryWidget, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &HistoryWidget::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *HistoryWidget::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *HistoryWidget::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/KeyManager.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/KeyManager.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/KeyManager.moc.cpp	2009-10-09 06:24:12.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/KeyManager.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'KeyManager.hpp'
- **
--** Created: Thu Oct 8 21:52:14 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "KeyManager.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'KeyManager.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_KeyManager[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      39,   12, // methods
-+      39,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+      21,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       12,   11,   11,   11, 0x05,
-@@ -101,9 +103,13 @@
-       qt_meta_data_KeyManager, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &KeyManager::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *KeyManager::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *KeyManager::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/PathTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/PathTool.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/PathTool.moc.cpp	2009-10-09 06:24:12.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/PathTool.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'PathTool.hpp'
- **
--** Created: Thu Oct 8 21:52:14 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "PathTool.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'PathTool.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_PathTool[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       7,   12, // methods
-+       7,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       10,    9,    9,    9, 0x08,
-@@ -50,9 +52,13 @@
-       qt_meta_data_PathTool, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &PathTool::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *PathTool::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *PathTool::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/QTTerm.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/QTTerm.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/QTTerm.moc.cpp	2009-10-09 06:24:18.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/QTTerm.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'QTTerm.hpp'
- **
--** Created: Thu Oct 8 21:52:14 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "QTTerm.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'QTTerm.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_QTTerm[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      15,   12, // methods
-+      15,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       4,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       10,    8,    7,    7, 0x05,
-@@ -65,9 +67,13 @@
-       qt_meta_data_QTTerm, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &QTTerm::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *QTTerm::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *QTTerm::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/replaceform.ui.h FreeMat-4.0.1-Source.new/libs/libXP/replaceform.ui.h
---- FreeMat-4.0.1-Source/libs/libXP/replaceform.ui.h	2009-10-09 06:24:12.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/replaceform.ui.h	2010-03-03 13:17:50.000000000 +0000
-@@ -1,10 +1,10 @@
- /********************************************************************************
--** Form generated from reading ui file 'replaceform.ui'
-+** Form generated from reading UI file 'replaceform.ui'
- **
--** Created: Thu Oct 8 21:52:13 2009
--**      by: Qt User Interface Compiler version 4.5.2
-+** Created: Wed Mar 3 13:17:50 2010
-+**      by: Qt User Interface Compiler version 4.6.2
- **
--** WARNING! All changes made in this file will be lost when recompiling ui file!
-+** WARNING! All changes made in this file will be lost when recompiling UI file!
- ********************************************************************************/
- 
- #ifndef REPLACEFORM_H
-@@ -74,7 +74,7 @@
- #ifndef Q_OS_MAC
-         vboxLayout->setSpacing(6);
- #endif
--        vboxLayout->setMargin(0);
-+        vboxLayout->setContentsMargins(0, 0, 0, 0);
-         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-         vboxLayout->setContentsMargins(0, 0, 0, 0);
-         hboxLayout = new QHBoxLayout();
-@@ -82,7 +82,7 @@
-         hboxLayout->setSpacing(6);
- #endif
- #ifndef Q_OS_MAC
--        hboxLayout->setMargin(0);
-+        hboxLayout->setContentsMargins(0, 0, 0, 0);
- #endif
-         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
-         label = new QLabel(layoutWidget);
-@@ -113,7 +113,7 @@
- #ifndef Q_OS_MAC
-         hboxLayout1->setSpacing(6);
- #endif
--        hboxLayout1->setMargin(0);
-+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
-         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
-         label_2 = new QLabel(layoutWidget);
-         label_2->setObjectName(QString::fromUtf8("label_2"));
-@@ -146,7 +146,7 @@
- #ifndef Q_OS_MAC
-         vboxLayout1->setSpacing(6);
- #endif
--        vboxLayout1->setMargin(0);
-+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
-         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
-         vboxLayout1->setContentsMargins(0, 0, 0, 0);
-         cbSensitive = new QCheckBox(layoutWidget1);
-@@ -176,7 +176,7 @@
- #ifndef Q_OS_MAC
-         vboxLayout2->setSpacing(6);
- #endif
--        vboxLayout2->setMargin(0);
-+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
-         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
-         vboxLayout2->setContentsMargins(0, 0, 0, 0);
-         btReplace = new QPushButton(layoutWidget2);
-@@ -234,7 +234,6 @@
-         btReplaceAll->setText(QApplication::translate("FMReplaceDialog", "Replace All", 0, QApplication::UnicodeUTF8));
-         btFind->setText(QApplication::translate("FMReplaceDialog", "Find Next", 0, QApplication::UnicodeUTF8));
-         btClose->setText(QApplication::translate("FMReplaceDialog", "Close", 0, QApplication::UnicodeUTF8));
--        Q_UNUSED(FMReplaceDialog);
-     } // retranslateUi
- 
- };
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/StackTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/StackTool.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/StackTool.moc.cpp	2009-10-09 06:24:19.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/StackTool.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'StackTool.hpp'
- **
--** Created: Thu Oct 8 21:52:13 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "StackTool.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'StackTool.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_StackTool[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       3,   12, // methods
-+       3,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       11,   10,   10,   10, 0x05,
-@@ -49,9 +51,13 @@
-       qt_meta_data_StackTool, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &StackTool::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *StackTool::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *StackTool::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/ToolDock.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/ToolDock.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/ToolDock.moc.cpp	2009-10-09 06:24:19.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/ToolDock.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'ToolDock.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "ToolDock.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'ToolDock.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_ToolDock[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
-        0,    0, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-        0        // eod
- };
-@@ -40,9 +42,13 @@
-       qt_meta_data_ToolDock, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &ToolDock::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *ToolDock::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *ToolDock::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/libs/libXP/VariablesTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/VariablesTool.moc.cpp
---- FreeMat-4.0.1-Source/libs/libXP/VariablesTool.moc.cpp	2009-10-09 06:24:20.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/libs/libXP/VariablesTool.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'VariablesTool.hpp'
- **
--** Created: Thu Oct 8 21:52:15 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "VariablesTool.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'VariablesTool.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_VariablesTool[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       1,   12, // methods
-+       1,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       0,       // signalCount
- 
-  // slots: signature, parameters, type, tag, flags
-       15,   14,   14,   14, 0x09,
-@@ -43,9 +45,13 @@
-       qt_meta_data_VariablesTool, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &VariablesTool::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *VariablesTool::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *VariablesTool::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/src/application.moc.cpp FreeMat-4.0.1-Source.new/src/application.moc.cpp
---- FreeMat-4.0.1-Source/src/application.moc.cpp	2009-10-09 06:27:01.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/src/application.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'application.hpp'
- **
--** Created: Thu Oct 8 21:53:56 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "application.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'application.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_ApplicationWindow[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      31,   12, // methods
-+      31,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       6,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       19,   18,   18,   18, 0x05,
-@@ -86,9 +88,13 @@
-       qt_meta_data_ApplicationWindow, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &ApplicationWindow::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *ApplicationWindow::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *ApplicationWindow::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/src/DumbTerminal.moc.cpp FreeMat-4.0.1-Source.new/src/DumbTerminal.moc.cpp
---- FreeMat-4.0.1-Source/src/DumbTerminal.moc.cpp	2009-10-09 06:27:01.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/src/DumbTerminal.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'DumbTerminal.hpp'
- **
--** Created: Thu Oct 8 21:53:56 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "DumbTerminal.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'DumbTerminal.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_DumbTerminal[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      13,   12, // methods
-+      13,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       16,   14,   13,   13, 0x05,
-@@ -63,9 +65,13 @@
-       qt_meta_data_DumbTerminal, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &DumbTerminal::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *DumbTerminal::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *DumbTerminal::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/src/FuncMode.moc.cpp FreeMat-4.0.1-Source.new/src/FuncMode.moc.cpp
---- FreeMat-4.0.1-Source/src/FuncMode.moc.cpp	2009-10-09 06:27:01.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/src/FuncMode.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'FuncMode.hpp'
- **
--** Created: Thu Oct 8 21:53:56 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "FuncMode.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'FuncMode.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_FuncMode[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--       2,   12, // methods
-+       2,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       1,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       10,    9,    9,    9, 0x05,
-@@ -46,9 +48,13 @@
-       qt_meta_data_FuncMode, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &FuncMode::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *FuncMode::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *FuncMode::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/src/MainApp.moc.cpp FreeMat-4.0.1-Source.new/src/MainApp.moc.cpp
---- FreeMat-4.0.1-Source/src/MainApp.moc.cpp	2009-10-09 06:27:01.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/src/MainApp.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'MainApp.hpp'
- **
--** Created: Thu Oct 8 21:53:56 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "MainApp.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'MainApp.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_MainApp[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      21,   12, // methods
-+      21,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-        9,    8,    8,    8, 0x05,
-@@ -75,9 +77,13 @@
-       qt_meta_data_MainApp, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &MainApp::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *MainApp::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *MainApp::qt_metacast(const char *_clname)
-diff -wbBur FreeMat-4.0.1-Source/src/Terminal.moc.cpp FreeMat-4.0.1-Source.new/src/Terminal.moc.cpp
---- FreeMat-4.0.1-Source/src/Terminal.moc.cpp	2009-10-09 06:27:01.000000000 +0000
-+++ FreeMat-4.0.1-Source.new/src/Terminal.moc.cpp	2010-03-03 13:22:19.000000000 +0000
-@@ -1,8 +1,8 @@
- /****************************************************************************
- ** Meta object code from reading C++ file 'Terminal.hpp'
- **
--** Created: Thu Oct 8 21:53:56 2009
--**      by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
-+** Created: Wed Mar 3 13:22:19 2010
-+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
- **
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
-@@ -10,8 +10,8 @@
- #include "Terminal.hpp"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'Terminal.hpp' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 61
--#error "This file was generated using the moc from 4.5.2. It"
-+#elif Q_MOC_OUTPUT_REVISION != 62
-+#error "This file was generated using the moc from 4.6.2. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
- #endif
-@@ -20,13 +20,15 @@
- static const uint qt_meta_data_Terminal[] = {
- 
-  // content:
--       2,       // revision
-+       4,       // revision
-        0,       // classname
-        0,    0, // classinfo
--      13,   12, // methods
-+      13,   14, // methods
-        0,    0, // properties
-        0,    0, // enums/sets
-        0,    0, // constructors
-+       0,       // flags
-+       3,       // signalCount
- 
-  // signals: signature, parameters, type, tag, flags
-       12,   10,    9,    9, 0x05,
-@@ -62,9 +64,13 @@
-       qt_meta_data_Terminal, 0 }
- };
- 
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject &Terminal::getStaticMetaObject() { return staticMetaObject; }
-+#endif //Q_NO_DATA_RELOCATION
-+
- const QMetaObject *Terminal::metaObject() const
- {
--    return &staticMetaObject;
-+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
- }
- 
- void *Terminal::qt_metacast(const char *_clname)
diff --git a/community/freemat/input-fix.patch b/community/freemat/input-fix.patch
deleted file mode 100644
index 92a66176b..000000000
--- a/community/freemat/input-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur FreeMat-4.0.1-Source/libs/libCore/Loader.cpp FreeMat-4.0.1-Source.my/libs/libCore/Loader.cpp
---- FreeMat-4.0.1-Source/libs/libCore/Loader.cpp	2009-10-09 06:23:29.000000000 +0000
-+++ FreeMat-4.0.1-Source.my/libs/libCore/Loader.cpp	2010-12-27 12:04:20.000000000 +0000
-@@ -388,7 +388,7 @@
-   context->addSpecialFunction("warning",WarningFunction,1,0,"msg",NULL);
-   context->addFunction("error",ErrorFunction,1,0,"string",NULL);
-   context->addSpecialFunction("eval",EvalFunction,2,-1,"try_clause","catch_clause",NULL);
--  context->addSpecialFunction("evalin",EvalInFunction,2,3,"workspace","expression",NULL);
-+  context->addSpecialFunction("evalin",EvalInFunction,3,3,"workspace","expression","catch_clause",NULL);
-   context->addSpecialFunction("assignin",AssignInFunction,3,0,"workspace","variablename","value",NULL);
-   context->addSpecialFunction("feval",FevalFunction,-1,-1,NULL);
-   context->addSpecialFunction("exist",ExistFunction,2,1,"item","kind",NULL);
diff --git a/community/gkrellm/ChangeLog b/community/gkrellm/ChangeLog
deleted file mode 100644
index d64831587..000000000
--- a/community/gkrellm/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2010-01-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-* Update to major release 2.3.4
-* Patch removed - implemented in source
-
-2007-11-29 Roman Kyrylych <roman@archlinux.org>
-* Patched for lm_sensors 3
-
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/ibus-hangul/ibus-1.4.0.patch b/community/ibus-hangul/ibus-1.4.0.patch
deleted file mode 100644
index 0c043d374..000000000
--- a/community/ibus-hangul/ibus-1.4.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur ibus-hangul-1.3.1-orig/configure.ac ibus-hangul-1.3.1/configure.ac
---- ibus-hangul-1.3.1-orig/configure.ac	2011-10-02 03:36:02.000000000 -0400
-+++ ibus-hangul-1.3.1/configure.ac	2011-10-02 03:37:01.000000000 -0400
-@@ -52,7 +52,7 @@
- 
- # check ibus
- PKG_CHECK_MODULES(IBUS, [
--    ibus-1.0 >= 1.2.99
-+    ibus-1.0 >= 1.3.99
- ])
- 
- # check libhangul
-diff -Naur ibus-hangul-1.3.1-orig/src/engine.c ibus-hangul-1.3.1/src/engine.c
---- ibus-hangul-1.3.1-orig/src/engine.c	2011-10-02 03:36:02.000000000 -0400
-+++ ibus-hangul-1.3.1/src/engine.c	2011-10-02 03:37:51.000000000 -0400
-@@ -175,8 +194,7 @@
- void
- ibus_hangul_init (IBusBus *bus)
- {
--    gboolean res;
--    GValue value = { 0, };
-+    GVariant* value;
- 
-     hanja_table = hanja_table_load (NULL);
- 
-@@ -187,22 +205,22 @@
-         g_object_ref_sink (config);
- 
-     hangul_keyboard = g_string_new_len ("2", 8);
--    res = ibus_config_get_value (config, "engine/Hangul",
--                                         "HangulKeyboard", &value);
--    if (res) {
--        const gchar* str = g_value_get_string (&value);
-+    value = ibus_config_get_value (config, "engine/Hangul",
-+                                         "HangulKeyboard");
-+    if (value != NULL) {
-+        const gchar* str = g_variant_get_string (value, NULL);
-         g_string_assign (hangul_keyboard, str);
--        g_value_unset(&value);
-+        g_variant_unref(value);
-     }
- 
-     hanja_key_list_init(&hanja_keys);
- 
--    res = ibus_config_get_value (config, "engine/Hangul",
--                                         "HanjaKeys", &value);
--    if (res) {
--        const gchar* str = g_value_get_string (&value);
-+    value = ibus_config_get_value (config, "engine/Hangul",
-+                                         "HanjaKeys");
-+    if (value != NULL) {
-+        const gchar* str = g_variant_get_string (value, NULL);
-         hanja_key_list_set_from_string(&hanja_keys, str);
--        g_value_unset(&value);
-+        g_variant_unref(value);
-     } else {
- 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
- 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
diff --git a/community/libcgns/PKGBUILD b/community/libcgns/PKGBUILD
deleted file mode 100644
index 4338d5222..000000000
--- a/community/libcgns/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Klimov Max <cleemmi@gmail.com>
-
-pkgname=libcgns
-_basever=3.1.3
-_relver=4
-pkgver=${_basever}.${_relver}
-pkgrel=1
-pkgdesc='General purpose library for the storage and retrieval of computational fluid dynamics analysis data by CGNS standard'
-arch=('i686' 'x86_64')
-url='http://www.cgns.org'
-license=('custom')
-conflicts=('libcgns2')
-makedepends=('cmake')
-source=("http://downloads.sourceforge.net/project/cgns/cgnslib_${_basever:0:3}/cgnslib_${_basever}-${_relver}.tar.gz")
-md5sums=('442bba32b576f3429cbd086af43fd4ae')
-
-# need to tell cmake when to build 64bit version
-[[ "$CARCH" == "i686" ]] && _64bits=OFF
-[[ "$CARCH" == "x86_64" ]] && _64bits=ON
-
-build() {
-  mkdir build
-  cd build
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_SKIP_RPATH:BOOL=ON \
-    -DENABLE_64BIT:BOOL=${_64bits} \
-    -DENABLE_TESTS:BOOL=ON \
-    ../cgnslib_${_basever}
-
-  make
-}
-
-check() {
-  cd build
-
-  make test
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # install license
-  install -d ${pkgdir}/usr/share/licenses/libcgns
-  install -m644 ${srcdir}/cgnslib_${_basever}/license.txt \
-    ${pkgdir}/usr/share/licenses/libcgns
-}
diff --git a/community/libdesktop-agnostic/PKGBUILD b/community/libdesktop-agnostic/PKGBUILD
deleted file mode 100644
index 3c0072045..000000000
--- a/community/libdesktop-agnostic/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=libdesktop-agnostic
-pkgver=0.3.92
-pkgrel=1
-pkgdesc="Provides an extensible config API, a unified virtual fs API, and a desktop item editor for GLib-based projects."
-arch=('i686' 'x86_64')
-url="https://launchpad.net/libdesktop-agnostic"
-license=('GPL' 'LGPL')
-depends=('glib2' 'gtk2' 'pygtk' 'pygobject')
-makedepends=('gobject-introspection' 'vala>=0.8.1' 'intltool'
-             'gconf')
-optdepends=('gconf: gconf configuration backend')
-options=('!libtool')
-backup=(etc/xdg/libdesktop-agnostic/desktop-agnostic.ini)
-source=(https://launchpad.net/$pkgname/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        gir.patch)
-md5sums=('42374d226a21d57637f97173f6b105a1'
-         '346e06ae914ec0c12e5f1fa1c4796575')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Force source regeneration
-  rm -r gen_src
-
-  # fix for python 2.7
-  sed -i '1s|^#!.*python$|&2|' waf
-  export PYTHON=/usr/bin/python2
-
-  # fix to enable introspection
-  patch -Np1 -i "$srcdir/gir.patch"
-
-  ./waf configure --config-backends=gconf,keyfile --vfs-backends=gio \
-      --desktop-entry-backends=gio,glib --prefix=/usr --sysconfdir=/etc
-  ./waf
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./waf install --destdir="$pkgdir" --sysconfdir="$pkgdir/etc"
-}
diff --git a/community/libdesktop-agnostic/gir.patch b/community/libdesktop-agnostic/gir.patch
deleted file mode 100644
index 88824cf76..000000000
--- a/community/libdesktop-agnostic/gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -u -r libdesktop-agnostic-0.3.92/libdesktop-agnostic/wscript libdesktop-agnostic-0.3.92-gir/libdesktop-agnostic/wscript
---- libdesktop-agnostic-0.3.92/libdesktop-agnostic/wscript	2011-03-12 15:14:23.000000000 +0100
-+++ libdesktop-agnostic-0.3.92-gir/libdesktop-agnostic/wscript	2011-03-27 18:51:13.170000225 +0200
-@@ -67,8 +67,9 @@
- 
- 
- def create_typelib_task():
--    rule = 'LD_LIBRARY_PATH="${CURRENT_BUILD_DIR}" ${G_IR_COMPILER} ' + \
--           '-o ${TGT} ${SRC}'
-+    rule = '${G_IR_COMPILER}' + \
-+           ' --includedir "${CURRENT_BUILD_DIR}"' + \
-+           ' -o ${TGT} ${SRC}'
-     Task.simple_task_type('typelib', rule, after='cc_link')
- 
- create_typelib_task()
-diff -u -r libdesktop-agnostic-0.3.92/wscript libdesktop-agnostic-0.3.92-gir/wscript
---- libdesktop-agnostic-0.3.92/wscript	2011-03-13 16:09:47.000000000 +0100
-+++ libdesktop-agnostic-0.3.92-gir/wscript	2011-03-27 18:51:46.973335650 +0200
-@@ -71,7 +71,7 @@
-                    help='Enables the library to be built so that it is '
-                         'instrumented to measure performance.')
-     opt.add_option('--disable-gi', action='store_true',
--                   dest='no_gi', default=True)
-+                   dest='no_gi', default=False)
- 
- 
- def configure(conf):
diff --git a/community/libphobos/PKGBUILD b/community/libphobos/PKGBUILD
deleted file mode 100644
index 227067776..000000000
--- a/community/libphobos/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 61679 2012-01-06 12:52:49Z cbrannon $
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Anders Bergh <anders1@gmail.com>
-# Contributor: Dawid Ciezarkiewicz <dawid.ciezarkiewicz@jabster.pl>
-
-pkgname=libphobos
-pkgver=1.072
-pkgrel=1
-pkgdesc="Runtime library for the D programming language"
-arch=('i686' x86_64)
-url="http://www.digitalmars.com/d/1.0/"
-source=(http://ftp.digitalmars.com/dmd.$pkgver.zip dmd.conf)
-depends=(dmd=$pkgver)
-license=('custom')
-conflicts=('libtango')
-
-build() {
-  install -d "$pkgdir/usr/include/d"
-  cd "$srcdir/dmd/src/phobos"
-  cp -Rf std "$pkgdir/usr/include/d"
-  cp -Rf etc "$pkgdir/usr/include/d" 
-  cp -Rf internal "$pkgdir/usr/include/d"
-  cp -f {crc32,object,gcstats}.d "$pkgdir/usr/include/d"
-
-  if [ $CARCH == x86_64 ]; then
-    install -Dm644 "$srcdir/dmd/linux/lib64/libphobos.a" "$pkgdir/usr/lib/libphobos.a"
-  else
-    install -Dm644 "$srcdir/dmd/linux/lib32/libphobos.a" "$pkgdir/usr/lib/libphobos.a"
-  fi
-
-  install -Dm644 "$srcdir/dmd.conf" "$pkgdir/etc/dmd.conf"
-
-  # Get rid of this subdirectory; it's just an unpacked zlib source
-  # distribution.
-  rm -rf "${pkgdir}/usr/include/d/etc/c/zlib"
-  # Insure that files and directories under /usr/include/d have
-  # correct permissions.
-  find "${pkgdir}/usr/include/d" -type d -print0 |xargs -0 chmod 755
-  find "${pkgdir}/usr/include/d" -type f -print0 |xargs -0 chmod 644
-  install -Dm644 phoboslicense.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-md5sums=('d5489b94f06c7ca2f4b5de62f7e6815a'
-         'e93f0ccb1e5c00cd222af5a9be3f599a')
diff --git a/community/libphobos/dmd.conf b/community/libphobos/dmd.conf
deleted file mode 100644
index 262f0b224..000000000
--- a/community/libphobos/dmd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Environment]
-DFLAGS=-I/usr/include/d -L-L/usr/lib
diff --git a/community/lshw/abi_stdlib.diff b/community/lshw/abi_stdlib.diff
deleted file mode 100644
index ffe88d1d8..000000000
--- a/community/lshw/abi_stdlib.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -wbBur lshw-B.02.14/src/core/abi.cc lshw-B.02.14.my//src/core/abi.cc
---- lshw-B.02.14/src/core/abi.cc	2009-02-12 22:53:09.000000000 +0000
-+++ lshw-B.02.14.my//src/core/abi.cc	2010-05-24 14:30:18.000000000 +0000
-@@ -10,6 +10,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <dirent.h>
-+#include <stdlib.h>
- 
- __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
- 
-diff -wbBur lshw-B.02.14/src/core/scsi.cc lshw-B.02.14.my//src/core/scsi.cc
---- lshw-B.02.14/src/core/scsi.cc	2009-02-12 22:53:09.000000000 +0000
-+++ lshw-B.02.14.my//src/core/scsi.cc	2010-05-24 14:32:13.000000000 +0000
-@@ -842,7 +842,7 @@
- 
-           if (!controller)
-           {
--            controller = node.addChild(hwNode::hwNode("scsi", hw::storage));
-+            controller = node.addChild(hwNode("scsi", hw::storage));
-             if (controller)
-             {
-               controller->setLogicalName(host_logicalname(number));
diff --git a/community/megaglest/megaglest.sh b/community/megaglest/megaglest.sh
deleted file mode 100644
index 571a01be7..000000000
--- a/community/megaglest/megaglest.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
- # Wrapper script for Megaglest.
- 
- MAINDIR=/usr/share/megaglest
- BASEDIR="$HOME/.config"
- DIR="$BASEDIR/megaglest"
- if [ ! -d "$DIR" ]; then
- mkdir -p $DIR
- fi
- cd $DIR
- [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini .
- [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest .
- [ -f servers.ini ] || cp $MAINDIR/servers.ini .
- [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini .
- for i in data scenarios techs tilesets tutorials; do
- [ -h $i ] || ln -s $MAINDIR/$i .
- done
- [ -d maps ] || mkdir maps
- [ -d screens ] || mkdir screens
- cd maps
- for i in $MAINDIR/maps/*; do
- [ -h `basename $i` ] || ln -s $i .
- done
- cd ..
- 
- exec ./megaglest
\ No newline at end of file
diff --git a/community/mythtv/build.patch b/community/mythtv/build.patch
deleted file mode 100644
index 35dccd618..000000000
--- a/community/mythtv/build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp
---- a/libs/libmythui/mythrender_opengl.cpp	2011-05-16 08:57:52.000000000 +1200
-+++ b/libs/libmythui/mythrender_opengl.cpp	2011-10-23 15:05:33.178392264 +1300
-@@ -2,6 +2,8 @@
- #include "mythrender_opengl.h"
- #include "mythxdisplay.h"
- 
-+#include <GL/glu.h>
-+
- #define LOC QString("OpenGL: ")
- #define LOC_ERR QString("OpenGL Error: ")
- 
-Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ
diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf
deleted file mode 100644
index e004ae5bd..000000000
--- a/community/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Rename this file to:
-#
-#    /etc/config.d/mythbackend
-#
-###############################################################################
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  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
-#
-###############################################################################
-#
-# Config variables for the mythbackend startup script, which is usually
-# located in /etc/rc.d/mythbackend
-#
-# When the startup script is executed, it sources this file if it exists,
-# otherwise it will fall back on default values.
-#
-# Leave variables commented out to use default values in init script
-# (/etc/rc.d/mythbackend).
-#
-# To override defaults, uncomment the relevant variable definition and
-# edit as required.
-#
-
-#
-# User who should start the mythbackend processes
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Directory holding the mythbackend binary (empty means autodetect).
-#
-# MBE_DIR=''
-
-#
-# Name of mythbackend binary.
-#
-# MBE_PROG='mythbackend'
-
-#
-# Other startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTIONS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_DIR='/var/log/mythtv'
-
-#
-# Name of mythbackend log file.
-#
-# NOTE: If you are running as non-root take care to ensure the mythbackend user
-# has permission to write to this log file.
-#
-# LOG_FILE='mythbackend.log'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc
deleted file mode 100644
index 410e8de41..000000000
--- a/community/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Default values to use if none are supplied in the config file.
-
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# User who should start the mythbackend processes
-MBE_USER='root'
-
-# Startup options for mythbackend
-MBE_OPTIONS=''
-
-# Name of mythbackend log file
-LOG_FILE='/var/log/mythbackend.log'
-
-# Logging options for mythbackend (empty means '-v important,general')
-LOG_OPTS=''
-
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -f ${CONFIG_FILE} ]]; then
-    . ${CONFIG_FILE}
-fi
-
-pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
-
-# fix FS#11890 
-mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
-
-case "$1" in
-    start)
-	stat_busy "Starting MythTV Backend"
-
-	# already running ?
-	if [[ "${pid}" -gt  0 ]] && kill -0 "${pid}"; then
-	    stat_fail
-	    exit 1;
-	fi	    
-	touch ${PIDFILE} ${LOG_FILE}
-	chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
-	if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
-	--daemon \
-        --logfile $LOG_FILE $LOG_OPTS \
-        --pidfile ${PIDFILE} $MBE_OPTIONS"; 
-	then
-	    add_daemon mythbackend
-	    stat_done
-	else
-	    stat_fail
-	fi
-	;;
-    
-    stop)
-	stat_busy "Stopping MythTV Backend"
-	if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
-	    rm_daemon mythbackend
-	    stat_done
-	    rm ${PIDFILE} 2>/dev/null
-	else
-	    stat_fail
-	fi
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/mythtv/mythtv-v4l2-fix.patch b/community/mythtv/mythtv-v4l2-fix.patch
deleted file mode 100644
index e26e16615..000000000
--- a/community/mythtv/mythtv-v4l2-fix.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
-   --disable-iptv           disable support for recording RTSP/UDP/RTP streams
-   --disable-hdhomerun      disable support for HDHomeRun boxes
-   --disable-v4l            disable Video4Linux support
--  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l support
-+  --disable-v4l2           disable Video4Linux2 support
-+  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l2 support
-   --disable-hdpvr          disable HD-PVR support
-   --disable-dvb            disable DVB support
-   --dvb-path=HDRLOC        location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
-     qtwebkit
-     quartz_video
-     v4l
-+    v4l2
-     valgrind
-     x11
-     xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
-         fi
-         disable opengl_vsync
-         disable v4l
-+        disable v4l2
-         disable x11
-         # Workaround compile errors from missing gmtime_r/localtime_r/uint def
-         CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
-         fi
-         disable symver
-         disable v4l
-+        disable v4l2
-         enable  windows
-         disable x11
-         ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
- 
- if enabled backend; then
-   echo "Video4Linux sup.          ${v4l-no}"
-+  echo "Video4Linux2 sup.         ${v4l2-no}"
-   echo "ivtv support              ${ivtv-no}"
-   echo "HD-PVR support            ${hdpvr-no}"
-   echo "FireWire support          ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
- 
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- #include "go7007_myth.h"
- 
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else  // USING_V4l
-+#else  // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
- 
- #define KEYFRAMEDIST   30
- 
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
- 
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     usingv4l2 = true;
- 
-     struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
-     QString driver = (char *)vcap.driver;
-     if (driver == "go7007")
-         go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
-         audio_device->Close();
- }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
-     NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
-         act_text_buffer = 0;
-     textbuffer[act]->freeToEncode = 1;
- }
--#else  // USING_V4L
-+#else  // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
-     //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
- 
--#else  // USING_V4L
-+#else  // USING_V4L 
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
- 
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
- 
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-     }
-     else
-     {
-+#ifdef USING_V4L
-         struct video_tuner tuner;
-         bzero(&tuner, sizeof(tuner));
- 
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-         {
-             isLocked = tuner.signal;
-         }
-+#endif
-     }
- 
-     {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
- 
- #include <algorithm>
- 
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
- 
-@@ -28,6 +28,8 @@
- 
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
-     (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     struct v4l2_capability vcap;
-     bzero(&vcap, sizeof(vcap));
- 
-     return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
-             (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
-     return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
- 
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
-     if (videofd < 0)
-         return false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     // First try V4L2 query
-     struct v4l2_capability capability;
-     bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
-     }
-     else // Fallback to V4L1 query
-     {
-+#ifdef USING_V4L
-         struct video_capability capability;
-         if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
-             card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
-     }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- 
-     if (!driver.isEmpty())
-         driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-     InputNames list;
-     ok = false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
-     // V4L v2 query
-     struct v4l2_input vin;
-     bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-         ok = true;
-         return list;
-     }
-+#endif
- 
-     // V4L v1 query
-+#ifdef USING_V4L
-     struct video_capability vidcap;
-     bzero(&vidcap, sizeof(vidcap));
-     if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- 
-         list[i] = test.name;
-     }
--
-+#endif
-     // Create an input on single input cards that don't advertise input
-     if (!list.size())
-         list[0] = "Television";
- 
-     ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
-     list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-     return list;
- }
- 
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
- 
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
-         channel = new DVBChannel(device);
- #endif
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (("V4L" == card_type) || ("MPEG" == card_type))
-         channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
-     cardTypes += "'DVB'";
- #endif // USING_DVB
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (!cardTypes.isEmpty())
-         cardTypes += ",";
-     cardTypes += "'V4L'";
- # ifdef USING_IVTV
-     cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_IPTV
-     if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
- 
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
-     HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
-     HEADERS += vbitext/vbi.h vbitext/vt.h
-     SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
-     SOURCES += channelchangemonitor.cpp
- 
-     # Support for Video4Linux devices
--    using_v4l {
-+    using_v4l || using_v4l2 {
-         HEADERS += v4lchannel.h                analogsignalmonitor.h
-         SOURCES += v4lchannel.cpp              analogsignalmonitor.cpp
- 
--        DEFINES += USING_V4L
-+        using_v4l {
-+            DEFINES += USING_V4L
-+        }
-+
-+        using_v4l2 {
-+            DEFINES += USING_V4L2
-+        }
-     }
- 
-     # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- #   include "dvbchannel.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #   include "analogsignalmonitor.h"
- #   include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
-     }
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     if ((cardtype.toUpper() == "HDPVR"))
-     {
-         V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
- 
- #include "channelgroup.h"
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
- 
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
-     }
-     else // "V4L" or "MPEG", ie, analog TV
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         channel = new V4LChannel(this, genOpt.videodev);
-         if (!channel->Open())
-             return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
-     }
-     else
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         // V4L/MJPEG/GO7007 from here on
-         recorder = new NuppelVideoRecorder(this, channel);
-         recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-     }
- 
-     if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
- 
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
-                                   channel->GetCurrentName());
-     }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (GetV4LChannel())
-     {
-         channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-     {
-         if (fmt == "NTSC-JP")
-             return 6;
-+#ifdef USING_V4L
-         else if (fmt.left(5) == "SECAM")
-             return VIDEO_MODE_SECAM;
-+#endif
-         else if (fmt == "PAL-NC")
-             return 3;
-         else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt == "PAL-N")
-             return 5;
-         // generics...
-+#ifdef USING_V4L
-         else if (fmt.left(3) == "PAL")
-             return VIDEO_MODE_PAL;
-         else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt.left(4) == "ATSC")
-             return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
-         return VIDEO_MODE_NTSC;
-+#endif 
-     }
- 
-     VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
-     }
-     else if (1 == v4l_version)
-     {
-+#ifdef USING_V4L    
-         if (mode == VIDEO_MODE_NTSC)
-             return "NTSC";
-         else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
-             return "PAL-N";
-         else if (mode == 6)
-             return "NTSC-JP";
-+#endif
-     }
-     else
-     {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-         return true;
-     }
- 
-+#ifdef USING_V4L
-     // Video4Linux version 1 tuning
-     uint freq = frequency / 62500;
-     ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-                 .arg(device).arg(ioctlval).arg(strerror(errno)));
-         return false;
-     }
-+#endif
- 
-     SetSIStandard(si_std);
- 
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- 
-     if (usingv4l1)
-     {
-+#ifdef USING_V4L
-         VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
- 
-         // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-         {
-             VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
-                     "\n\t\t\twhile setting format (v4l v1)" + ENO);
--        }
--        else if (usingv4l2)
-+        } else
-+#endif
-+        if (usingv4l2)
-         {
-             VERBOSE(VB_IMPORTANT, LOC + msg +
-                     "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
-     return ok;
- }
- 
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
-     int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
-     }
-     return NULL;
- }
-+#endif
- 
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-     }
- 
-     // V4L1
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-         VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
-         return false;
-     }
--
-+#endif
-     return true;
- }
- 
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
- 
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
- 
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
-     unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
-     if (setfield)
-         return *setfield;
-+#endif
- 
-     return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- 
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-         // ???
-         return -1;
-     }
--
-+#endif
-     return 0;
- }
- 
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
- 
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
- 
- using namespace std;
- 
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- //       compiling with -std=c99.  We could remove this in the .pro file,
- //       but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size;                // its current size
- 
- 
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
- 
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
-     setTrigger(cardtype);
-     setSaveAll(false);
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     addTarget("V4L",       new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
-     addTarget("MPEG",      new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
-     addTarget("HDPVR",     new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     addTarget("DVB",       new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
- 
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("Analog V4L capture card"), "V4L");
-     setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
-     setting->addSelection(
-         QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
-         QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
-         "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_HDHOMERUN
-     setting->addSelection(
diff --git a/community/mythtv/mythtv.install b/community/mythtv/mythtv.install
deleted file mode 100644
index c29a53454..000000000
--- a/community/mythtv/mythtv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
-}
-
-post_upgrade() {
-	return
-}
-
-post_remove() {
-   echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
-}
diff --git a/community/openmovieeditor/PKGBUILD b/community/openmovieeditor/PKGBUILD
deleted file mode 100644
index cef330b33..000000000
--- a/community/openmovieeditor/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57799 2011-11-03 09:07:09Z spupykin $
-# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
-# Maintainer: Robert Emil Berge
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=openmovieeditor
-pkgver=0.0.20090105
-pkgrel=8
-pkgdesc="A simple video editor"
-arch=('i686' 'x86_64')
-url="http://openmovieeditor.sourceforge.net/HomePage"
-license=('GPL')
-depends=('libquicktime' 'libsamplerate' 'fltk' 'jack'
-	 'portaudio' 'gmerlin-avdecoder' 'libxtst')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ce4f76c0b3e90aabf9c2d5c8dd31e9b1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  unset LDFLAGS
-
-  export CFLAGS="$CFLAGS -fpermissive"
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  export CPPFLAGS="$CPPFLAGS -fpermissive"
-  sed -i 's|= sizes();|= (short*)sizes();|g' src/Fl_Split.cpp
-
-  # Fix missing includes
-  sed -e 's|<sstream>|<sstream>\n#include <stdint.h>|' -i src/VideoViewGL.H
-  sed -e 's|<string>|<string>\n#include <stdint.h>|' -i src/WaveForm.H
-  sed -e 's|<stdint.h>|<stdint.h>\n#include <stdio.h>|' -i src/AddCommand.H
-  sed -e 's|<string>|<stdint.h>\n#include <stdio.h>|' -i src/MediaBrowser.H
-  sed -e 's|<iostream>|<iostream>\n#include <stdio.h>|' -i src/fl_font_browser.h
-
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/perl-crypt-openssl-bignum/PKGBUILD b/community/perl-crypt-openssl-bignum/PKGBUILD
deleted file mode 100644
index 33f382066..000000000
--- a/community/perl-crypt-openssl-bignum/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=perl-crypt-openssl-bignum
-pkgver=0.04
-pkgrel=5
-pkgdesc="OpenSSL's multiprecision integer arithmetic "
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum"
-depends=('perl' 'openssl')
-license=('GPL')
-option=('!emptydirs')
-source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz)
-md5sums=('9369ef722b0705c0604998559988eb18')
-
-build() {
-  cd  $startdir/src/Crypt-OpenSSL-Bignum-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-  make pure_install doc_install DESTDIR=$startdir/pkg
-  find $startdir/pkg -name '.packlist' -delete
-  find $startdir/pkg -name '*.pod' -delete
-}
diff --git a/community/perl-crypt-openssl-random/PKGBUILD b/community/perl-crypt-openssl-random/PKGBUILD
deleted file mode 100644
index b9a8adb52..000000000
--- a/community/perl-crypt-openssl-random/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=perl-crypt-openssl-random
-pkgver=0.04
-pkgrel=5
-pkgdesc="Interface to OpenSSL PRNG methods"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-OpenSSL-Random"
-depends=('perl' 'openssl')
-license=('GPL')
-option=('!emptydirs')
-source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz)
-md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a')
-
-build() {
-  cd  $startdir/src/Crypt-OpenSSL-Random-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-  make pure_install doc_install DESTDIR=$startdir/pkg
-  find $startdir/pkg -name '.packlist' -delete
-  find $startdir/pkg -name '*.pod' -delete
-}
diff --git a/community/perl-crypt-openssl-rsa/PKGBUILD b/community/perl-crypt-openssl-rsa/PKGBUILD
deleted file mode 100644
index dcedd07a7..000000000
--- a/community/perl-crypt-openssl-rsa/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 56403 2011-10-07 09:48:48Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=perl-crypt-openssl-rsa
-pkgver=0.28
-pkgrel=1
-pkgdesc="Interface to OpenSSL RSA methods"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA"
-depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum')
-license=('GPL')
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz")
-md5sums=('86217a5036fc63779c30420b5fd84129')
-
-build() {
-  cd  $srcdir/Crypt-OpenSSL-RSA-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd  $srcdir/Crypt-OpenSSL-RSA-$pkgver
-  make pure_install doc_install DESTDIR=$pkgdir
-  find $pkgdir -name '.packlist' -delete
-  find $pkgdir -name '*.pod' -delete
-}
diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD
deleted file mode 100644
index d52341b39..000000000
--- a/community/stow/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Chris Brannon <cmbrannon79@gmail.com>
-
-pkgname=stow
-pkgver=2.1.2
-pkgrel=1
-pkgdesc='GNU Stow is a program for managing the installation of software packages'
-url='http://www.gnu.org/software/stow/'
-arch=('i686' 'x86_64')
-source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
-license=('GPL2')
-md5sums=('82857e43531cf6936aed99ef3b86b446')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/tucan/PKGBUILD b/community/tucan/PKGBUILD
deleted file mode 100644
index 5dd2d1a95..000000000
--- a/community/tucan/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Raul Pons Lopez <raulponslopez+aur {at} gmail {dot} com>
-
-pkgname=tucan
-pkgver=0.3.10
-pkgrel=1
-pkgdesc='Download and upload manager for hosting sites'
-arch=('i686' 'x86_64')
-url='http://tucaneando.com/index.html'
-license=('GPL3')
-depends=('python-imaging' 'python2' 'pygtk' 'tesseract' 'librsvg')
-source=("http://build-tucan-doc.googlecode.com/files/tucan-${pkgver}.tar.gz")
-md5sums=('35f49eb3f118051817d3692a13fa922c')
-
-build() {
-    cd ${pkgname}-${pkgver}
-
-    # python2 fix
-    sed -i 's_usr/bin/env python_usr/bin/env python2_' tucan.py
-}
-
-package() {
-    cd ${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir}/usr install
-    ln -sf /usr/share/tucan/tucan.py ${pkgdir}/usr/bin/tucan
-}
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
deleted file mode 100644
index 9528e2edb..000000000
--- a/community/wine/PKGBUILD
+++ /dev/null
@@ -1,149 +0,0 @@
-# $Id: PKGBUILD 61124 2011-12-21 21:17:31Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=wine
-pkgver=1.3.35
-pkgrel=3
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('5833787fcd7fee5a2299fade10a2760d')
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-license=(LGPL)
-install=wine.install
-
-depends=(
-  fontconfig      lib32-fontconfig
-  mesa            lib32-mesa 
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
-  giflib          lib32-giflib
-  libxpm          lib32-libxpm
-  libpng          lib32-libpng
-  libxinerama     lib32-libxinerama
-  libxcomposite   lib32-libxcomposite
-  libxmu          lib32-libxmu
-  libxxf86vm      lib32-libxxf86vm
-  libxml2         lib32-libxml2
-  libxslt         lib32-libxslt
-  libldap         lib32-libldap
-  lcms            lib32-lcms
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  libcups         lib32-libcups
-  v4l-utils       lib32-v4l-utils
-  alsa-lib        lib32-alsa-lib
-  oss
-)
-  
-optdepends=(
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  libldap         lib32-libldap
-  lcms            lib32-lcms
-  libxml2         lib32-libxml2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  libcups         lib32-libcups
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  oss
-)
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-else
-  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts=('bin32-wine' 'wine-wow64')
-  replaces=('bin32-wine')
-fi
-
-build() {
-  cd "$srcdir"
-
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build
-
-  # These additional CFLAGS solve FS#27662
-  export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-  export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
-
-    mkdir $pkgname-64-build
-    cd "$srcdir/$pkgname-64-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --libdir=/usr/lib \
-      --with-x \
-      --enable-win64
-
-    make
-
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$pkgname-64-build"
-    )
-
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-x \
-    "${_wine32opts[@]}"
-
-  # These additional CFLAGS solve FS#27560
-  make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign"
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib32" \
-      dlldir="$pkgdir/usr/lib32/wine" install
-
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
deleted file mode 100644
index 0548b7ffd..000000000
--- a/community/wine/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
-	update-desktop-database -q
-}
diff --git a/core/btrfs-progs-unstable/PKGBUILD b/core/btrfs-progs-unstable/PKGBUILD
deleted file mode 100644
index 61b4d52cb..000000000
--- a/core/btrfs-progs-unstable/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 142300 2011-11-08 06:06:06Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=btrfs-progs-unstable
-pkgver=0.19.20101006
-pkgrel=2
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
-url="http://btrfs.wiki.kernel.org/"
-license=('GPL2')
-
-build() {
-   cd $srcdir/$pkgname
-   make CFLAGS="$CFLAGS" all convert
-}
-
-package() {
-   cd $srcdir/$pkgname
-   make prefix=$pkgdir/usr bindir=$pkgdir/sbin install
-   # fix manpage
-   mkdir -p $pkgdir/usr/share/
-   mv $pkgdir/usr/man $pkgdir/usr/share/man
-}
-md5sums=('6bce610ed1720e6b9dc9fa96cbd8b73e')
diff --git a/core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch b/core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch
deleted file mode 100644
index d189c5a77..000000000
--- a/core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- btrfs-progs-0.19/btrfsck.c	
-+++ btrfs-progs-0.19/btrfsck.c	
-@@ -21,6 +21,9 @@ 
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"
---- btrfs-progs-0.19/mkfs.c	
-+++ btrfs-progs-0.19/mkfs.c	
-@@ -341,7 +341,7 @@ int main(int ac, char **av)
- 	u64 alloc_start = 0;
- 	u64 metadata_profile = BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP;
- 	u64 data_profile = BTRFS_BLOCK_GROUP_RAID0;
--	u32 leafsize = getpagesize();
-+	u32 leafsize = sysconf(_SC_PAGESIZE);
- 	u32 sectorsize = 4096;
- 	u32 nodesize = leafsize;
- 	u32 stripesize = 4096;
-@@ -398,7 +398,7 @@ int main(int ac, char **av)
- 				print_usage();
- 		}
- 	}
--	sectorsize = max(sectorsize, (u32)getpagesize());
-+	sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
- 	if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
- 		fprintf(stderr, "Illegal leafsize %u\n", leafsize);
- 		exit(1);
diff --git a/core/curl/fix-J-with-O-regression.patch b/core/curl/fix-J-with-O-regression.patch
deleted file mode 100644
index 4b7de1a23..000000000
--- a/core/curl/fix-J-with-O-regression.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 20 Nov 2011 23:33:46 +0100
-Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
-
-A regression between 7.22.0 and 7.23.0 -- downloading a file with the
-flags -O and -J results in the content being written to stdout if and
-only if there was no Content-Disposition header in the http response. If
-there is a C-D header with a filename attribute, the output is correctly
-written.
-
-Reported by: Dave Reisner
-Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
----
- src/tool_cb_hdr.c      |    3 +-
- src/tool_operate.c     |   59 ++++++++++++++++++++++----------------------
- src/tool_operhlp.c     |   18 +++++++++++++
- tests/data/Makefile.am |    2 +-
- tests/data/test1210    |   63 ++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 112 insertions(+), 33 deletions(-)
- create mode 100644 tests/data/test1210
-
-diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
-index fb24b45..dea7338 100644
---- a/src/tool_cb_hdr.c
-+++ b/src/tool_cb_hdr.c
-@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
-   }
- #endif
- 
--  if(!outs->filename && (cb > 20) &&
--    checkprefix("Content-disposition:", str)) {
-+  if((cb > 20) && checkprefix("Content-disposition:", str)) {
-     const char *p = str + 20;
- 
-     /* look for the 'filename=' parameter
-diff --git a/src/tool_operate.c b/src/tool_operate.c
-index 7ab815f..1e88120 100644
---- a/src/tool_operate.c
-+++ b/src/tool_operate.c
-@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
- 
-           if((urlnode->flags & GETOUT_USEREMOTE)
-              && config->content_disposition) {
--            /* Our header callback sets the filename */
-+            /* Our header callback MIGHT set the filename */
-             DEBUGASSERT(!outs.filename);
-           }
--          else {
--            if(config->resume_from_current) {
--              /* We're told to continue from where we are now. Get the size
--                 of the file as it is now and open it for append instead */
--              struct_stat fileinfo;
--              /* VMS -- Danger, the filesize is only valid for stream files */
--              if(0 == stat(outfile, &fileinfo))
--                /* set offset to current file size: */
--                config->resume_from = fileinfo.st_size;
--              else
--                /* let offset be 0 */
--                config->resume_from = 0;
--            }
- 
--            if(config->resume_from) {
--              /* open file for output: */
--              FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
--              if(!file) {
--                helpf(config->errors, "Can't open '%s'!\n", outfile);
--                res = CURLE_WRITE_ERROR;
--                goto quit_urls;
--              }
--              outs.fopened = TRUE;
--              outs.stream = file;
--              outs.init = config->resume_from;
--            }
--            else {
--              outs.stream = NULL; /* open when needed */
-+          if(config->resume_from_current) {
-+            /* We're told to continue from where we are now. Get the size
-+               of the file as it is now and open it for append instead */
-+            struct_stat fileinfo;
-+            /* VMS -- Danger, the filesize is only valid for stream files */
-+            if(0 == stat(outfile, &fileinfo))
-+              /* set offset to current file size: */
-+              config->resume_from = fileinfo.st_size;
-+            else
-+              /* let offset be 0 */
-+              config->resume_from = 0;
-+          }
-+
-+          if(config->resume_from) {
-+            /* open file for output: */
-+            FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
-+            if(!file) {
-+              helpf(config->errors, "Can't open '%s'!\n", outfile);
-+              res = CURLE_WRITE_ERROR;
-+              goto quit_urls;
-             }
--            outs.filename = outfile;
--            outs.s_isreg = TRUE;
-+            outs.fopened = TRUE;
-+            outs.stream = file;
-+            outs.init = config->resume_from;
-+          }
-+          else {
-+            outs.stream = NULL; /* open when needed */
-           }
-+          outs.filename = outfile;
-+          outs.s_isreg = TRUE;
-         }
- 
-         if(uploadfile && !stdin_upload(uploadfile)) {
-diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
-index 808d2d5..4c1697b 100644
---- a/src/tool_operhlp.c
-+++ b/src/tool_operhlp.c
-@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url)
-         return CURLE_OUT_OF_MEMORY;
-     }
-   }
-+
-+  /* in case we built debug enabled, we allow an environment variable
-+   * named CURL_TESTDIR to prefix the given file name to put it into a
-+   * specific directory
-+   */
-+#ifdef DEBUGBUILD
-+  {
-+    char *tdir = curlx_getenv("CURL_TESTDIR");
-+    if(tdir) {
-+      char buffer[512]; /* suitably large */
-+      snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename);
-+      Curl_safefree(*filename);
-+      *filename = strdup(buffer); /* clone the buffer */
-+      curl_free(tdir);
-+    }
-+  }
-+#endif
-+
-   return CURLE_OK;
- }
- 
--- 
-1.7.7.3
diff --git a/core/glibc/glibc-2.15-math64crash.patch b/core/glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/core/glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- 			s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
- 
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
--	.type	__ceil, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__ceil_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__ceil_c(%rip), %rax
--2:	ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
--	roundsd	$2, %xmm0, %xmm0
--	ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
--	.type	__floor, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__floor_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__floor_c(%rip), %rax
--2:	ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
--	roundsd	$1, %xmm0, %xmm0
--	ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __cos_fma4 ((void *) 0)
--#  define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/core/libarchive/release-2.8-fixes.patch b/core/libarchive/release-2.8-fixes.patch
deleted file mode 100644
index c21eeaa7b..000000000
--- a/core/libarchive/release-2.8-fixes.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: build/cmake/config.h.in
-===================================================================
---- build/cmake/config.h.in	(revision 3670)
-+++ build/cmake/config.h.in	(revision 3737)
-@@ -1,5 +1,8 @@
- /* config.h.  Generated from config.h.cmake by cmake configure */
- 
-+/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
-+#cmakedefine ZLIB_WINAPI 1
-+
- /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
- #cmakedefine ARCHIVE_HASH_MD5_LIBC
- 
-Index: libarchive/archive_read_support_format_all.c
-===================================================================
---- libarchive/archive_read_support_format_all.c	(revision 3670)
-+++ libarchive/archive_read_support_format_all.c	(revision 3737)
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2003-2007 Tim Kientzle
-+ * Copyright (c) 2003-2011 Tim Kientzle
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-@@ -39,5 +39,13 @@
- 	archive_read_support_format_tar(a);
- 	archive_read_support_format_xar(a);
- 	archive_read_support_format_zip(a);
-+
-+	/* Note: We always return ARCHIVE_OK here, even if some of the
-+	 * above return ARCHIVE_WARN.  The intent here is to enable
-+	 * "as much as possible."  Clients who need specific
-+	 * compression should enable those individually so they can
-+	 * verify the level of support. */
-+	/* Clear any warning messages set by the above functions. */
-+	archive_clear_error(a);
- 	return (ARCHIVE_OK);
- }
-Index: libarchive/archive_write_disk.c
-===================================================================
---- libarchive/archive_write_disk.c	(revision 3670)
-+++ libarchive/archive_write_disk.c	(revision 3737)
-@@ -1513,6 +1513,22 @@
- }
- 
- #if defined(_WIN32) || defined(__CYGWIN__)
-+static int
-+guidword(const char *p, int n)
-+{
-+	int i;
-+
-+	for (i = 0; i < n; i++) {
-+		if ((*p >= '0' && *p <= '9') ||
-+		    (*p >= 'a' && *p <= 'f') ||
-+		    (*p >= 'A' && *p <= 'F'))
-+			p++;
-+		else
-+			return (-1);
-+	}
-+	return (0);
-+}
-+
- /*
-  * 1. Convert a path separator from '\' to '/' .
-  *    We shouldn't check multi-byte character directly because some
-@@ -1521,26 +1537,92 @@
-  * 2. Replace unusable characters in Windows with underscore('_').
-  * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
-  */
--static void
-+static int
- cleanup_pathname_win(struct archive_write_disk *a)
- {
- 	wchar_t wc;
- 	char *p;
- 	size_t alen, l;
- 
--	alen = 0;
--	l = 0;
--	for (p = a->name; *p != '\0'; p++) {
--		++alen;
--		if (*p == '\\')
--			l = 1;
-+	p = a->name;
-+	/* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
-+	 * "\\?\Volume{GUID}\"
-+	 * (absolute path prefixes used by Windows API) */
-+	if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
-+	    (p[2] == '.' || p[2] == '?') && (p[3] ==  '\\' || p[3] == '/'))
-+	{
-+		/* A path begin with "\\?\UNC\" */
-+		if (p[2] == '?' &&
-+		    (p[4] == 'U' || p[4] == 'u') &&
-+		    (p[5] == 'N' || p[5] == 'n') &&
-+		    (p[6] == 'C' || p[6] == 'c') &&
-+		    (p[7] == '\\' || p[7] == '/'))
-+			p += 8;
-+		/* A path begin with "\\?\Volume{GUID}\" */
-+		else if (p[2] == '?' &&
-+		    (p[4] == 'V' || p[4] == 'v') &&
-+		    (p[5] == 'O' || p[5] == 'o') &&
-+		    (p[6] == 'L' || p[6] == 'l') &&
-+		    (p[7] == 'U' || p[7] == 'u') &&
-+		    (p[8] == 'M' || p[8] == 'm') &&
-+		    (p[9] == 'E' || p[9] == 'e') &&
-+		    p[10] == '{') {
-+			if (guidword(p+11, 8) == 0 && p[19] == '-' &&
-+			    guidword(p+20, 4) == 0 && p[24] == '-' &&
-+			    guidword(p+25, 4) == 0 && p[29] == '-' &&
-+			    guidword(p+30, 4) == 0 && p[34] == '-' &&
-+			    guidword(p+35, 12) == 0 && p[47] == '}' &&
-+			    (p[48] == '\\' || p[48] == '/'))
-+				p += 49;
-+			else
-+				p += 4;
-+		/* A path begin with "\\.\PhysicalDriveX" */
-+		} else if (p[2] == '.' &&
-+		    (p[4] == 'P' || p[4] == 'p') &&
-+		    (p[5] == 'H' || p[5] == 'h') &&
-+		    (p[6] == 'Y' || p[6] == 'y') &&
-+		    (p[7] == 'S' || p[7] == 's') &&
-+		    (p[8] == 'I' || p[8] == 'i') &&
-+		    (p[9] == 'C' || p[9] == 'c') &&
-+		    (p[9] == 'A' || p[9] == 'a') &&
-+		    (p[9] == 'L' || p[9] == 'l') &&
-+		    (p[9] == 'D' || p[9] == 'd') &&
-+		    (p[9] == 'R' || p[9] == 'r') &&
-+		    (p[9] == 'I' || p[9] == 'i') &&
-+		    (p[9] == 'V' || p[9] == 'v') &&
-+		    (p[9] == 'E' || p[9] == 'e') &&
-+		    (p[10] >= '0' && p[10] <= '9') &&
-+		    p[11] == '\0') {
-+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+			    "Path is a physical drive name");
-+			return (ARCHIVE_FAILED);
-+		} else
-+			p += 4;
-+	}
-+
-+	/* Skip leading drive letter from archives created
-+	 * on Windows. */
-+	if (((p[0] >= 'a' && p[0] <= 'z') ||
-+	     (p[0] >= 'A' && p[0] <= 'Z')) &&
-+		 p[1] == ':') {
-+		if (p[2] == '\0') {
-+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+			    "Path is a drive name");
-+			return (ARCHIVE_FAILED);
-+		}
-+		if (p[2] == '\\' || p[2] == '/')
-+			p += 3;
-+	}
-+
-+	for (; *p != '\0'; p++) {
- 		/* Rewrite the path name if its character is a unusable. */
- 		if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
- 		    *p == '<' || *p == '>' || *p == '|')
- 			*p = '_';
- 	}
--	if (alen == 0 || l == 0)
--		return;
-+	alen = p - a->name;
-+	if (alen == 0 || strchr(a->name, '\\') == NULL)
-+		return (ARCHIVE_OK);
- 	/*
- 	 * Convert path separator.
- 	 */
-@@ -1560,6 +1642,7 @@
- 		p += l;
- 		alen -= l;
- 	}
-+	return (ARCHIVE_OK);
- }
- #endif
- 
-@@ -1583,7 +1666,8 @@
- 	}
- 
- #if defined(_WIN32) || defined(__CYGWIN__)
--	cleanup_pathname_win(a);
-+	if (cleanup_pathname_win(a) != ARCHIVE_OK)
-+		return (ARCHIVE_FAILED);
- #endif
- 	/* Skip leading '/'. */
- 	if (*src == '/')
-Index: libarchive/archive_util.c
-===================================================================
---- libarchive/archive_util.c	(revision 3670)
-+++ libarchive/archive_util.c	(revision 3737)
-@@ -155,6 +155,7 @@
- {
- 	archive_string_empty(&a->error_string);
- 	a->error = NULL;
-+	a->archive_error_number = 0;
- }
- 
- void
-Index: libarchive/archive_read_extract.c
-===================================================================
---- libarchive/archive_read_extract.c	(revision 3670)
-+++ libarchive/archive_read_extract.c	(revision 3737)
-@@ -108,7 +108,7 @@
- 	if (r != ARCHIVE_OK)
- 		/* If _write_header failed, copy the error. */
-  		archive_copy_error(&a->archive, ad);
--	else if (archive_entry_size(entry) > 0)
-+	else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
- 		/* Otherwise, pour data into the entry. */
- 		r = copy_data(_a, ad);
- 	r2 = archive_write_finish_entry(ad);
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 3670)
-+++ CMakeLists.txt	(revision 3737)
-@@ -154,6 +154,13 @@
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  IF(WIN32 AND NOT CYGWIN)
-+    SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-+    SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+    CHECK_C_SOURCE_Runs(
-+      "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+      ZLIB_WINAPI)
-+  ENDIF(WIN32 AND NOT CYGWIN)
- ENDIF(ZLIB_FOUND)
- MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
- MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
-
-Property changes on: .
-___________________________________________________________________
-Modified: svn:mergeinfo
-   Merged /trunk:r1989,3247,3722
-
diff --git a/core/libarchive/sparse-file.patch b/core/libarchive/sparse-file.patch
deleted file mode 100644
index e7d3e473b..000000000
--- a/core/libarchive/sparse-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libarchive/archive_write_set_format_pax.c
-===================================================================
---- libarchive/archive_write_set_format_pax.c	(revision 4094)
-+++ libarchive/archive_write_set_format_pax.c	(working copy)
-@@ -1647,7 +1647,7 @@
- 			return (total);
- 
- 		p = ((const unsigned char *)buff) + total;
--		ws = s;
-+		ws = s - total;
- 		if (ws > pax->sparse_list->remaining)
- 			ws = pax->sparse_list->remaining;
- 
diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD
deleted file mode 100644
index b6050d66d..000000000
--- a/core/module-init-tools/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 144465 2011-12-06 10:57:39Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=module-init-tools
-pkgver=3.16
-pkgrel=3
-pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules"
-arch=('i686' 'x86_64')
-url="https://modules.wiki.kernel.org"
-license=('GPL')
-depends=('glibc')
-makedepends=('docbook2x')
-backup=('etc/modprobe.d/modprobe.conf'
-        'etc/depmod.d/depmod.conf')
-source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2"
-        modprobe.conf
-        depmod.conf
-        docfix.patch)
-md5sums=('bc44832c6e41707b8447e2847d2019f5'
-         '325657db471b3190f685e5a89c9b90e3'
-         '4b8cbcbc54b9029c99fd730e257d4436'
-         '4320d19902ded43bed55c804b065cdc7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix headers in SGML manpage sources and an XML typo
-  patch -Np0 < "$srcdir/docfix.patch"
-
-  ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR=$pkgdir install
-
-  # extra modprobe.d and depmod.d conf dirs
-  install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d"
-
-  # Install custom depmod config to allow searching extramodules/
-  install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf"
-
-  # Install our custom (empty) modprobe.conf
-  install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf"
-}
diff --git a/core/module-init-tools/depmod.conf b/core/module-init-tools/depmod.conf
deleted file mode 100644
index 3feb67b05..000000000
--- a/core/module-init-tools/depmod.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/depmod.d/depmod.conf
-#
-
-search updates extramodules built-in
diff --git a/core/module-init-tools/docfix.patch b/core/module-init-tools/docfix.patch
deleted file mode 100644
index 0151ca3f1..000000000
--- a/core/module-init-tools/docfix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/depmod.conf.sgml.orig	2011-06-25 10:07:15.897805024 -0400
-+++ doc/depmod.conf.sgml	2011-06-25 10:07:48.810805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/depmod.sgml.orig	2011-06-25 10:07:15.898805024 -0400
-+++ doc/depmod.sgml	2011-06-25 10:07:56.636805021 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
-@@ -52,7 +52,7 @@
-       <arg><option>-n</option></arg>
-       <arg><option>-v</option></arg>
-       <arg><option>-P <replaceable>prefix</replaceable></option></arg>
--      <arg><option>-w</option><arg>
-+      <arg><option>-w</option></arg>
-       <arg><option><replaceable>version</replaceable></option></arg>
-       <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
-     </cmdsynopsis>
---- doc/insmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
-+++ doc/insmod.sgml	2011-06-25 10:07:59.228805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/lsmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
-+++ doc/lsmod.sgml	2011-06-25 10:08:04.804805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modinfo.sgml.orig	2011-06-25 10:07:15.900805024 -0400
-+++ doc/modinfo.sgml	2011-06-25 10:08:07.630805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modprobe.conf.sgml.orig	2011-06-25 10:07:15.901805024 -0400
-+++ doc/modprobe.conf.sgml	2011-06-25 10:08:10.173805018 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modprobe.sgml.orig	2011-06-25 10:07:15.902805024 -0400
-+++ doc/modprobe.sgml	2011-06-25 10:08:13.623805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modules.dep.sgml.orig	2011-06-25 10:07:15.903805024 -0400
-+++ doc/modules.dep.sgml	2011-06-25 10:08:19.323805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/rmmod.sgml.orig	2011-06-25 10:07:15.904805024 -0400
-+++ doc/rmmod.sgml	2011-06-25 10:08:27.691805017 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
diff --git a/core/module-init-tools/modprobe.conf b/core/module-init-tools/modprobe.conf
deleted file mode 100644
index 551bdfbdf..000000000
--- a/core/module-init-tools/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/modprobe.d/modprobe.conf
-#
diff --git a/core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch b/core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
deleted file mode 100644
index 3ff89ae43..000000000
--- a/core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Wed, 18 Jan 2012 05:06:18 +0100
-Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
-
-Some broken kernel drivers load firmware synchronously in the module init
-path and block modprobe until the firmware request is fulfilled.
-
-The modprobe-generated firmware request is a direct child device of the
-device which caused modprobe to run. Child device event are blocked until
-the parent device is handled. This dead-locks until the kernel firmware
-loading timeout of 60 seconds is reached.
-
-The hanging modprobe event should now time-out and allow the firmware
-event to run before the 60 second kernel timeout.
----
- src/udev-event.c |    2 +-
- src/udevd.c      |   62 +++++++++++++++++++++++++++++++++++++++++++----------
- 2 files changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/udev-event.c b/src/udev-event.c
-index 9bdc518..f0b9548 100644
---- a/src/udev-event.c
-+++ b/src/udev-event.c
-@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
-         udev_list_init(udev, &event->run_list, false);
-         event->fd_signal = -1;
-         event->birth_usec = now_usec();
--        event->timeout_usec = 60 * 1000 * 1000;
-+        event->timeout_usec = 30 * 1000 * 1000;
-         dbg(event->udev, "allocated event %p\n", event);
-         return event;
- }
-diff --git a/src/udevd.c b/src/udevd.c
-index 11ab19a..77a1e79 100644
---- a/src/udevd.c
-+++ b/src/udevd.c
-@@ -133,6 +133,7 @@ struct worker {
-         struct udev_monitor *monitor;
-         enum worker_state state;
-         struct event *event;
-+        unsigned long long event_start_usec;
- };
- 
- /* passed from worker to main process */
-@@ -372,6 +373,7 @@ out:
-                 close(fd_inotify);
-                 close(worker_watch[WRITE_END]);
-                 udev_rules_unref(rules);
-+                udev_builtin_exit(udev);
-                 udev_monitor_unref(worker_monitor);
-                 udev_unref(udev);
-                 udev_log_close();
-@@ -389,6 +391,7 @@ out:
-                 worker->monitor = worker_monitor;
-                 worker->pid = pid;
-                 worker->state = WORKER_RUNNING;
-+                worker->event_start_usec = now_usec();
-                 worker->event = event;
-                 event->state = EVENT_RUNNING;
-                 udev_list_node_append(&worker->node, &worker_list);
-@@ -419,6 +422,7 @@ static void event_run(struct event *event)
-                 worker_ref(worker);
-                 worker->event = event;
-                 worker->state = WORKER_RUNNING;
-+                worker->event_start_usec = now_usec();
-                 event->state = EVENT_RUNNING;
-                 return;
-         }
-@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
-                                 continue;
- 
-                         /* worker returned */
--                        worker->event->exitcode = msg.exitcode;
--                        event_queue_delete(worker->event, true);
--                        worker->event = NULL;
-+                        if (worker->event) {
-+                                worker->event->exitcode = msg.exitcode;
-+                                event_queue_delete(worker->event, true);
-+                                worker->event = NULL;
-+                        }
-                         if (worker->state != WORKER_KILLED)
-                                 worker->state = WORKER_IDLE;
-                         worker_unref(worker);
-@@ -796,7 +802,7 @@ static void handle_signal(struct udev *udev, int signo)
-                                 }
- 
-                                 if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
--                                        if (worker->event != NULL) {
-+                                        if (worker->event) {
-                                                 err(udev, "worker [%u] failed while handling '%s'\n",
-                                                     pid, worker->event->devpath);
-                                                 worker->event->exitcode = -32;
-@@ -1574,25 +1580,57 @@ int main(int argc, char *argv[])
-                                 break;
- 
-                         /* timeout at exit for workers to finish */
--                        timeout = 60 * 1000;
--                } else if (udev_list_node_is_empty(&event_list) && children > 2) {
--                        /* set timeout to kill idle workers */
--                        timeout = 3 * 1000;
--                } else {
-+                        timeout = 30 * 1000;
-+                } else if (udev_list_node_is_empty(&event_list) && children <= 2) {
-+                        /* we are idle */
-                         timeout = -1;
-+                } else {
-+                        /* kill idle or hanging workers */
-+                        timeout = 3 * 1000;
-                 }
-                 fdcount = epoll_wait(fd_ep, ev, ARRAY_SIZE(ev), timeout);
-                 if (fdcount < 0)
-                         continue;
- 
-                 if (fdcount == 0) {
-+                        struct udev_list_node *loop;
-+
-+                        /* timeout */
-                         if (udev_exit) {
--                                info(udev, "timeout, giving up waiting for workers to finish\n");
-+                                err(udev, "timeout, giving up waiting for workers to finish\n");
-                                 break;
-                         }
- 
--                        /* timeout - kill idle workers */
--                        worker_kill(udev, 2);
-+                        /* kill idle workers */
-+                        if (udev_list_node_is_empty(&event_list)) {
-+                                info(udev, "cleanup idle workers\n");
-+                                worker_kill(udev, 2);
-+                        }
-+
-+                        /* check for hanging events */
-+                        udev_list_node_foreach(loop, &worker_list) {
-+                                struct worker *worker = node_to_worker(loop);
-+
-+                                if (worker->state != WORKER_RUNNING)
-+                                        continue;
-+
-+                                if ((now_usec() - worker->event_start_usec) > 30 * 1000 * 1000) {
-+                                        err(udev, "worker [%u] timeout, kill it\n", worker->pid,
-+                                            worker->event ? worker->event->devpath : "<idle>");
-+                                        kill(worker->pid, SIGKILL);
-+                                        worker->state = WORKER_KILLED;
-+                                        /* drop reference taken for state 'running' */
-+                                        worker_unref(worker);
-+                                        if (worker->event) {
-+                                                err(udev, "seq %llu '%s' killed\n",
-+                                                    udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
-+                                                worker->event->exitcode = -64;
-+                                                event_queue_delete(worker->event, true);
-+                                                worker->event = NULL;
-+                                        }
-+                                }
-+                        }
-+
-                 }
- 
-                 is_worker = is_signal = is_inotify = is_netlink = is_ctrl = false;
--- 
-1.7.8.3
-
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
deleted file mode 100644
index 6bdf4e249..000000000
--- a/core/udev/81-arch.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# do not edit this file, it will be overwritten on update
-# this file is going away in the near future
-
-# this might belong in <http://aur.archlinux.org/packages.php?ID=22698>
-# see also /usr/src/*/Documentation/laptops/sonypi.txt
-KERNEL=="sonypi",	MODE="0666"
-
-# this might belong in <https://aur.archlinux.org/packages.php?ID=18393>
-KERNEL=="legousbtower*", MODE="0666"
diff --git a/core/zlib/zlib-1.2.5-lfs-decls.patch b/core/zlib/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644
index 36e26af03..000000000
--- a/core/zlib/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zlib-1.2.5/zlib.h
-===================================================================
---- zlib-1.2.5.orig/zlib.h
-+++ zlib-1.2.5/zlib.h
-@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
- #  define gzoffset gzoffset64
- #  define adler32_combine adler32_combine64
- #  define crc32_combine crc32_combine64
--#  ifdef _LARGEFILE64_SOURCE
-+#  ifndef _LARGEFILE64_SOURCE
-      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
deleted file mode 100644
index d4d3afe38..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Vojtech Horky <vojta . horky at-symbol seznam . cz>
-
-_pkgname=binutils
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-
-unset CFLAGS CXXFLAGS LDFLAGS
-
-pkgname=cross-${_target}-binutils
-pkgver=2.22
-pkgrel=11
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the MIPS architecture"
-url="http://www.gnu.org/software/binutils/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('zlib')
-source=("ftp://ftp.gnu.org/gnu/binutils/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('ee0f10756c84979622b992a4a61ea3f5')
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-
-    CFLAGS=" -pipe "\
-    CXXFLAGS=" -pipe "\
-    ./configure --build=${CHOST} \
-                --host=${CHOST} \
-                --target=${_target} \
-                --prefix=/usr \
-                --disable-nls \
-                --disable-multilib \
-                --disable-werror \
-                --enable-ld=yes \
-                --enable-gold=no \
-                --with-sysroot=${_sysroot}
-
-	make 
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	make DESTDIR=${pkgdir} install
-
-    rm -r ${pkgdir}/usr/{lib,share}
-}
diff --git a/extra/bluez/make-libcheck-optional.patch b/extra/bluez/make-libcheck-optional.patch
deleted file mode 100644
index a315a3898..000000000
--- a/extra/bluez/make-libcheck-optional.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800)
-Subject: build: Move libcheck under TEST conditional
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a
-
-build: Move libcheck under TEST conditional
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 9112483..5cf287c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -449,6 +449,7 @@ endif
- 
- unit_objects =
- 
-+if TEST
- unit_tests = unit/test-eir
- 
- noinst_PROGRAMS += $(unit_tests)
-@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
- unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
- unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
- unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
--unit_test_eir_SHORTNAME = unit
- unit_objects += $(unit_test_eir_OBJECTS)
-+else
-+unit_tests =
-+endif
- 
- TESTS = $(unit_tests)
- 
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2097d77..753b994 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
- 		[])
- ])
- 
-+AC_DEFUN([AC_PATH_CHECK], [
-+	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
-+	AC_SUBST(CHECK_CFLAGS)
-+	AC_SUBST(CHECK_LIBS)
-+])
-+
- AC_DEFUN([AC_PATH_OUI], [
- 	AC_ARG_WITH(ouifile,
- 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
-@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
- 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
- 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
--	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
-+	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
- 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
- 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
- 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
-diff --git a/configure.ac b/configure.ac
-index 3a5dfde..a7670da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,8 +24,6 @@ AC_PROG_YACC
- AM_PROG_LEX
- AM_PROG_MKDIR_P
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
--
- m4_define([_LT_AC_TAGCONFIG], [])
- m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
- 
-@@ -50,6 +48,7 @@ AC_PATH_UDEV
- AC_PATH_SNDFILE
- AC_PATH_OUI
- AC_PATH_READLINE
-+AC_PATH_CHECK
- 
- AC_ARG_BLUEZ
- 
diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD
deleted file mode 100644
index 018f70a54..000000000
--- a/extra/bogofilter/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
-
-pkgname=bogofilter
-pkgver=1.2.2
-pkgrel=4
-pkgdesc="A fast Bayesian spam filtering tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://bogofilter.sourceforge.net"
-depends=('db' 'perl' 'gsl')
-backup=('etc/bogofilter/bogofilter.cf')
-source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/bogofilter  \
-              --localstatedir=/var \
-              --enable-transactions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
-
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
-  install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
-}
diff --git a/extra/claws-mail/gnutls_buildfix.patch b/extra/claws-mail/gnutls_buildfix.patch
deleted file mode 100644
index 31de8eb8b..000000000
--- a/extra/claws-mail/gnutls_buildfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:08.682553870 +0100
-+++ claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:43.808349602 +0100
-@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc
- 	if (session == NULL || r != 0)
- 		return FALSE;
-   
-+#if GNUTLS_VERSION_NUMBER < 0x020c00
- 	gnutls_transport_set_lowat (session, 1); 
-+#endif
- 	gnutls_set_default_priority(session);
- 	gnutls_protocol_set_priority (session, proto_prio);
- 	gnutls_cipher_set_priority (session, cipher_prio);
diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch
deleted file mode 100644
index 0591fc420..000000000
--- a/extra/colord/scan_only_color_profile_dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Tue, 6 Dec 2011 09:49:49 +0000
-Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the
- parent dir
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542
----
- src/cd-profile-store.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c
-index ecad474..c662351 100644
---- a/src/cd-profile-store.c
-+++ b/src/cd-profile-store.c
-@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor,
- 	/* just rescan the correct directory */
- 	parent = g_file_get_parent (file);
- 	parent_path = g_file_get_path (parent);
--	g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path);
--	cd_profile_store_search_path (profile_store, parent_path);
-+	if (g_strcmp0 (parent_path, DATADIR) == 0) {
-+		g_debug ("CdProfileStore: %s was added, rescanning", path);
-+		cd_profile_store_search_path (profile_store, path);
-+	} else {
-+		g_debug ("CdProfileStore: %s was added, rescanning parent %s",
-+			 path, parent_path);
-+		cd_profile_store_search_path (profile_store, parent_path);
-+	}
- out:
- 	if (parent != NULL)
- 		g_object_unref (parent);
--- 
-1.7.6
-
diff --git a/extra/cppunit/gcc4.5.patch b/extra/cppunit/gcc4.5.patch
deleted file mode 100644
index 86d4a424d..000000000
--- a/extra/cppunit/gcc4.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cppunit-1.12.1.orig/src/cppunit/Makefile.am
-+++ cppunit-1.12.1/src/cppunit/Makefile.am
-@@ -63,5 +63,11 @@
- 
- libcppunit_la_LDFLAGS= \
-  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) @LIBADD_DL@
- 
-+TESTS = t_link
-+
-+check_PROGRAMS = t_link
-+
-+t_link_SOURCES = t_link.cpp
-+t_link_LDADD = libcppunit.la
diff --git a/extra/dirmngr/PKGBUILD b/extra/dirmngr/PKGBUILD
deleted file mode 100644
index f2f6b60e5..000000000
--- a/extra/dirmngr/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 134465 2011-08-04 06:40:27Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=dirmngr
-pkgver=1.1.0
-pkgrel=3
-pkgdesc="A daemon to handle CRL and certificate requests"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
-depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-install=dirmngr.install
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr  --libexecdir=/usr/lib
-  make 
-  make DESTDIR=$pkgdir install
-}
-md5sums=('f2570f0248f5947daac200e85291b328')
diff --git a/extra/dirmngr/dirmngr.install b/extra/dirmngr/dirmngr.install
deleted file mode 100644
index e26e0e7fd..000000000
--- a/extra/dirmngr/dirmngr.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(dirmngr.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/ffmpeg/revert-enabling-threads.patch b/extra/ffmpeg/revert-enabling-threads.patch
deleted file mode 100644
index dd50332ee..000000000
--- a/extra/ffmpeg/revert-enabling-threads.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921
-
-diff --git a/libavcodec/options.c b/libavcodec/options.c
-index 4ac9313..4ac92fd 100644
---- a/libavcodec/options.c
-+++ b/libavcodec/options.c
-@@ -370,7 +370,7 @@ static const AVOption options[]={
- {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},
- #endif
- {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
--{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"},
-+{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"},
- {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
- {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
- {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
diff --git a/extra/freeglut/2.6.0-GFX_radeon.patch b/extra/freeglut/2.6.0-GFX_radeon.patch
deleted file mode 100644
index 8806fe849..000000000
--- a/extra/freeglut/2.6.0-GFX_radeon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===================================================================
---- src/freeglut_window.c	(Revision 832)
-+++ src/freeglut_window.c	(Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
-     if ( window )
-     {
--        glXMakeContextCurrent(
-+        glXMakeCurrent(
-             fgDisplay.Display,
-             window->Window.Handle,
--            window->Window.Handle,
-             window->Window.Context
-         );
- 
-@@ -932,10 +932,9 @@
-     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
-                      &fgDisplay.DeleteWindow, 1 );
- 
--    glXMakeContextCurrent(
-+    glXMakeCurrent(
-         fgDisplay.Display,
-         window->Window.Handle,
--        window->Window.Handle,
-         window->Window.Context
-     );
- 
diff --git a/extra/freeglut/ChangeLog b/extra/freeglut/ChangeLog
deleted file mode 100644
index 7dd6847f9..000000000
--- a/extra/freeglut/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2009-12-30  Eric Belanger  <eric@archlinux.org>
-
-	* freeglut 2.6.0-1
-	* Upstream update
-	* Added libxi depends
-	* Changed license to MIT
-	* Added patch to fix an issue with the radeon[hd] ATI opensource drivers
-	* Added ChangeLog
diff --git a/extra/gluezilla/PKGBUILD b/extra/gluezilla/PKGBUILD
deleted file mode 100644
index 224068bd6..000000000
--- a/extra/gluezilla/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=gluezilla
-pkgver=2.6
-pkgrel=3
-pkgdesc="Web browser implementation (Gecko) for Mono, the free .NET runtime"
-arch=(i686 x86_64)
-license=('LGPL2' 'MPL')
-url="http://www.mono-project.com/"
-depends=('mono' 'xulrunner>=2.0')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xulrunner2.0.patch xulrunner2.0_configure.patch)
-md5sums=('bd4eb89747498945227877295fcd36b5'
-         '26ea3af3ef5ce045a13a3f3ee54cf0f6'
-         '06faa671dd791868701d98e610fcbc7e')
-
-build() {
-  cd ${srcdir}/gluezilla-${pkgver}
-  patch -p1 < ${srcdir}/xulrunner2.0.patch || return 1
-  patch -p1 < ${srcdir}/xulrunner2.0_configure.patch || return 1
-  
-  rm configure
-  autoconf
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-}
diff --git a/extra/gluezilla/configure_xulrunner.patch b/extra/gluezilla/configure_xulrunner.patch
deleted file mode 100644
index 6537a2066..000000000
--- a/extra/gluezilla/configure_xulrunner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure_old	2009-10-01 20:27:13.000000000 +0200
-+++ configure	2010-03-25 12:31:10.000000000 +0100
-@@ -19988,7 +19988,7 @@
- 
- 		{ echo "$as_me:$LINENO: checking Mozilla XPCOM > 1.8" >&5
- echo $ECHO_N "checking Mozilla XPCOM > 1.8... $ECHO_C" >&6; }
--		mozilla_xpcom_pcs="libxul-embedding-unstable"
-+		mozilla_xpcom_pcs="libxul-embedding"
- 		for pc in $mozilla_xpcom_pcs; do
- 			if $PKG_CONFIG --exists $pc; then
- 				{ echo "$as_me:$LINENO: result: $pc" >&5
diff --git a/extra/gluezilla/xulrunner2.0.patch b/extra/gluezilla/xulrunner2.0.patch
deleted file mode 100644
index 913795908..000000000
--- a/extra/gluezilla/xulrunner2.0.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/src/BrowserWindow.cpp b/src/BrowserWindow.cpp
-index f260295..10ae7bd 100755
---- a/src/BrowserWindow.cpp
-+++ b/src/BrowserWindow.cpp
-@@ -28,23 +28,6 @@
- NS_GENERIC_FACTORY_CONSTRUCTOR(SecurityWarningDialogs)
- NS_GENERIC_FACTORY_CONSTRUCTOR(PromptService)
- 
--static const nsModuleComponentInfo components[] = {
--  {
--	SECURITYWARNINGSDIALOGS_CLASSNAME,
--	SECURITYWARNINGSDIALOGS_CID,
--	NS_SECURITYWARNINGDIALOGS_CONTRACTID,
--	SecurityWarningDialogsConstructor
--  },
--  {
--	PROMPTSERVICE_CLASSNAME,
--	PROMPTSERVICE_CID,
--	NS_PROMPTSERVICE_CONTRACTID,
--	PromptServiceConstructor
--  }
--
--};
--
--
- BrowserWindow::BrowserWindow (void)
- {
- 	owner = nsnull;
-@@ -162,17 +145,17 @@ nsresult BrowserWindow::RegisterComponents ()
-     nsCOMPtr<nsIFactory> componentFactory;
-     rv = NS_NewSecurityWarningServiceFactory(getter_AddRefs(componentFactory));
-     if (NS_SUCCEEDED(rv)) {
--        compReg->RegisterFactory(components[0].mCID,
--                                 components[0].mDescription,
--                                 components[0].mContractID,
-+		compReg->RegisterFactory(kSECURITYWARNINGSDIALOGS_CID,
-+                                 SECURITYWARNINGSDIALOGS_CLASSNAME,
-+                                 NS_SECURITYWARNINGDIALOGS_CONTRACTID,
-                                  componentFactory);
- 	}
- 
-     rv = NS_NewPromptServiceFactory(getter_AddRefs(componentFactory), this);
-     if (NS_SUCCEEDED(rv)) {
--        compReg->RegisterFactory(components[1].mCID,
--                                 components[1].mDescription,
--                                 components[1].mContractID,
-+        compReg->RegisterFactory(kPROMPTSERVICE_CID,
-+                                 PROMPTSERVICE_CLASSNAME,
-+                                 NS_PROMPTSERVICE_CONTRACTID,
-                                  componentFactory);
- 	}
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3b7bce3..cd6ec99 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -26,7 +26,7 @@ libgluezilla_la_SOURCES = 	\
- 	gluezilla.h   \
- 	FastDelegate.h
- 
--if OLDXUL
-+if XUL_2
- libgluezilla_la_SOURCES += \
- 	gluezilla_nsIScriptContext.h \
- 	gluezilla_nsIScriptGlobalObject.h
-diff --git a/src/PromptService.h b/src/PromptService.h
-index 04fddb9..174bca4 100644
---- a/src/PromptService.h
-+++ b/src/PromptService.h
-@@ -20,8 +20,9 @@
- // {77686174-2061-6d20-6920-746F20646F20}

- #define PROMPTSERVICE_CID \

- { 0x77686174, 0x2061, 0x6d20, { 0x69, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x6F, 0x20 } }

--

--

-+
-+static NS_DEFINE_CID(kPROMPTSERVICE_CID, PROMPTSERVICE_CID);
-+
- class PromptService : public nsIPromptService

- {

- 	NS_DECL_ISUPPORTS

-diff --git a/src/SecurityWarningsDialogs.h b/src/SecurityWarningsDialogs.h
-index b75f529..ae352ad 100644
---- a/src/SecurityWarningsDialogs.h
-+++ b/src/SecurityWarningsDialogs.h
-@@ -21,8 +21,9 @@
- // {696E7465-7265-7374-696E-67206C696665}

- #define SECURITYWARNINGSDIALOGS_CID \

- { 0x696E7465, 0x7265, 0x7374, { 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x69, 0x66, 0x65 } }

--

--

-+
-+static NS_DEFINE_CID(kSECURITYWARNINGSDIALOGS_CID, SECURITYWARNINGSDIALOGS_CID);
-+
- class SecurityWarningDialogs : public nsISecurityWarningDialogs

- {

- public:

-diff --git a/src/interfaces.h b/src/interfaces.h
-index 3a9f9dd..6acebb8 100644
---- a/src/interfaces.h
-+++ b/src/interfaces.h
-@@ -4,7 +4,18 @@
- #define TO_STRING(x) #x
- 
- //Gecko Embedding API
-+#if XUL_VERSION < 4
- #include <nsEmbedAPI.h>
-+#else
-+#include <nscore.h>
-+#include <nsXPCOM.h>
-+#include <nsILocalFile.h>
-+#include <nsIDirectoryService.h>
-+#define NS_GRE_COMPONENT_DIR                    "GreComsD"
-+#define NS_XPCOM_COMPONENT_DIR                  "ComsD"
-+#define NS_XPCOM_COMPONENT_REGISTRY_FILE        "ComRegF"
-+#define NS_XPCOM_XPTI_REGISTRY_FILE             "XptiRegF"
-+#endif
- 
- //XPCOM API
- #include <nsCOMPtr.h>
-@@ -78,8 +89,12 @@
- #include <nsIPromptService.h>
- #include <nsISecurityWarningDialogs.h>
- #include <nsIComponentRegistrar.h>
-+#if XUL_VERSION < 4
- #include <nsIGenericFactory.h>
--
-+#else
-+#include <mozilla/ModuleUtils.h>
-+struct nsModuleComponentInfo;
-+#endif
- // preferences
- #include <nsIPrefBranch.h>
- #include <nsIPrefService.h>
-@@ -131,12 +146,15 @@
-   typedef type (NS_FROZENCALL * name##Type) params; \
-   extern name##Type name NS_HIDDEN;
- 
-+#if XUL_VERSION < 4
- XRE_API(nsresult,
- 	XRE_InitEmbedding, (nsILocalFile *aLibXULDirectory,
- 						nsILocalFile *aAppDirectory,
- 						nsIDirectoryServiceProvider *aAppDirProvider,
- 						nsStaticModuleInfo const *aStaticComponents,
- 						PRUint32 aStaticComponentCount))
-+#endif
-+
- 
- XRE_API(void, XRE_TermEmbedding, ())
- 
diff --git a/extra/gluezilla/xulrunner2.0_configure.patch b/extra/gluezilla/xulrunner2.0_configure.patch
deleted file mode 100644
index cb64208e3..000000000
--- a/extra/gluezilla/xulrunner2.0_configure.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac_new
-@@ -87,16 +87,23 @@
- 
- 	if test "x${oldxul}" != xyes ; then
- 
--		AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
--		mozilla_xpcom_pcs="libxul-embedding-unstable"
--		for pc in $mozilla_xpcom_pcs; do
--			if $PKG_CONFIG --exists $pc; then
--				AC_MSG_RESULT($pc)
--				mozilla_xpcom=$pc
--				XUL_VERSION=3
--				break;
--			fi
--		done
-+		if test -z $mozilla_xpcom; then
-+			AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
-+			mozilla_xpcom_pcs="libxul-embedding libxul-embedding-unstable"
-+			for pc in $mozilla_xpcom_pcs; do
-+				if $PKG_CONFIG --exists $pc; then
-+					mozilla_xpcom=$pc
-+					XUL_VERSION=3
-+					version="$(pkg-config --modversion $pc)"
-+					minor=`echo "$version" | sed -e 's,\([[0-9]]*\)\..*,\1,'`
-+					if test $minor -ge 2; then
-+						XUL_VERSION=4
-+					fi
-+					AC_MSG_RESULT(Found $version)
-+					break;
-+				fi
-+			done
-+		fi
- 	fi
- 
- 	if test -z $mozilla_xpcom; then
-@@ -121,9 +128,12 @@
- 	XPCOM_PKGS="$mozilla_xpcom"
- fi
- 
--AM_CONDITIONAL([OLDXUL], [test x$XUL_VERSION = x2])
--
- AC_SUBST(XUL_VERSION)
-+
-+AM_CONDITIONAL([XUL_4], [test x$XUL_VERSION = x4])
-+AM_CONDITIONAL([XUL_3], [test x$XUL_VERSION = x3])
-+AM_CONDITIONAL([XUL_2], [test x$XUL_VERSION = x2])
-+
- 
- AC_ARG_ENABLE([optimize],
- 	AC_HELP_STRING([--enable-optimize], [Enable optimizations (-O2)]),
diff --git a/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch b/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch
deleted file mode 100644
index cdb9140bf..000000000
--- a/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 7e654ab3ca6e8ac75ba5e45c2a411eb1c2904b26 Mon Sep 17 00:00:00 2001
-From: Marina Zhurakhinskaya <marinaz@redhat.com>
-Date: Tue, 20 Dec 2011 05:51:35 +0000
-Subject: notificationDaemon: group sources based on a combination of pid and title
-
-That way different system notifications, such as the ones about battery power
-and the ones about software updates, are shown with separate message tray
-sources.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664138
----
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index f40205d..c691efe 100644
---- a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -92,7 +92,7 @@ NotificationDaemon.prototype = {
-     _init: function() {
-         DBus.session.exportObject('/org/freedesktop/Notifications', this);
- 
--        this._sources = {};
-+        this._sources = [];
-         this._senderToPid = {};
-         this._notifications = {};
-         this._busProxy = new Bus();
-@@ -150,14 +150,30 @@ NotificationDaemon.prototype = {
-         }
-     },
- 
-+    _lookupSource: function(title, pid, trayIcon) {
-+        for (let i = 0; i < this._sources.length; i++) {
-+            let source = this._sources[i];
-+            if (source.pid == pid &&
-+                (source.initialTitle == title || source.trayIcon || trayIcon))
-+                return source;
-+        }
-+        return null;
-+    },
-+
-     // Returns the source associated with ndata.notification if it is set.
--    // Otherwise, returns the source associated with the pid if one is
--    // stored in this._sources and the notification is not transient.
--    // Otherwise, creates a new source as long as pid is provided.
-+    // Otherwise, returns the source associated with the title and pid if
-+    // such source is stored in this._sources and the notification is not
-+    // transient. If the existing or requested source is associated with
-+    // a tray icon and passed in pid matches a pid of an existing source,
-+    // the title match is ignored to enable representing a tray icon and
-+    // notifications from the same application with a single source.
-+    //
-+    // If no existing source is found, a new source is created as long as
-+    // pid is provided.
-     //
-     // Either a pid or ndata.notification is needed to retrieve or
-     // create a source.
--    _getSource: function(title, pid, ndata, sender) {
-+    _getSource: function(title, pid, ndata, sender, trayIcon) {
-         if (!pid && !(ndata && ndata.notification))
-             return null;
- 
-@@ -174,20 +190,24 @@ NotificationDaemon.prototype = {
-         // with a transient one from the same sender, so we
-         // always create a new source object for new transient notifications
-         // and never add it to this._sources .
--        if (!isForTransientNotification && this._sources[pid]) {
--            let source = this._sources[pid];
--            source.setTitle(title);
--            return source;
-+        if (!isForTransientNotification) {
-+            let source = this._lookupSource(title, pid, trayIcon);
-+            if (source) {
-+                source.setTitle(title);
-+                return source;
-+            }
-         }
- 
--        let source = new Source(title, pid, sender);
-+        let source = new Source(title, pid, sender, trayIcon);
-         source.setTransient(isForTransientNotification);
- 
-         if (!isForTransientNotification) {
--            this._sources[pid] = source;
-+            this._sources.push(source);
-             source.connect('destroy', Lang.bind(this,
-                 function() {
--                    delete this._sources[pid];
-+                    let index = this._sources.indexOf(source);
-+                    if (index >= 0)
-+                        this._sources.splice(index, 1);
-                 }));
-         }
- 
-@@ -261,7 +281,7 @@ NotificationDaemon.prototype = {
-         let sender = DBus.getCurrentMessageContext().sender;
-         let pid = this._senderToPid[sender];
- 
--        let source = this._getSource(appName, pid, ndata, sender);
-+        let source = this._getSource(appName, pid, ndata, sender, null);
- 
-         if (source) {
-             this._notifyForSource(source, ndata);
-@@ -282,7 +302,7 @@ NotificationDaemon.prototype = {
-                 if (!ndata)
-                     return;
- 
--                source = this._getSource(appName, pid, ndata, sender);
-+                source = this._getSource(appName, pid, ndata, sender, null);
- 
-                 // We only store sender-pid entries for persistent sources.
-                 // Removing the entries once the source is destroyed
-@@ -432,8 +452,8 @@ NotificationDaemon.prototype = {
-         if (!tracker.focus_app)
-             return;
- 
--        for (let id in this._sources) {
--            let source = this._sources[id];
-+        for (let i = 0; i < this._sources.length; i++) {
-+            let source = this._sources[i];
-             if (source.app == tracker.focus_app) {
-                 source.destroyNonResidentNotifications();
-                 return;
-@@ -456,12 +476,11 @@ NotificationDaemon.prototype = {
-     },
- 
-     _onTrayIconAdded: function(o, icon) {
--        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null);
--        source.setTrayIcon(icon);
-+        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon);
-     },
- 
-     _onTrayIconRemoved: function(o, icon) {
--        let source = this._sources[icon.pid];
-+        let source = this._lookupSource(icon.pid, null, true);
-         if (source)
-             source.destroy();
-     }
-@@ -476,10 +495,12 @@ function Source(title, pid, sender) {
- Source.prototype = {
-     __proto__:  MessageTray.Source.prototype,
- 
--    _init: function(title, pid, sender) {
-+    _init: function(title, pid, sender, trayIcon) {
-         MessageTray.Source.prototype._init.call(this, title);
- 
--        this._pid = pid;
-+        this.initialTitle = title;
-+
-+        this.pid = pid;
-         if (sender)
-             // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for
-             // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation,
-@@ -496,7 +517,12 @@ Source.prototype = {
-             this.title = this.app.get_name();
-         else
-             this.useNotificationIcon = true;
--        this._trayIcon = null;
-+
-+        this.trayIcon = trayIcon;
-+        if (this.trayIcon) {
-+           this._setSummaryIcon(this.trayIcon);
-+           this.useNotificationIcon = false;
-+        }
-     },
- 
-     _onNameVanished: function() {
-@@ -523,7 +549,7 @@ Source.prototype = {
-     },
- 
-     handleSummaryClick: function() {
--        if (!this._trayIcon)
-+        if (!this.trayIcon)
-             return false;
- 
-         let event = Clutter.get_current_event();
-@@ -544,11 +570,11 @@ Source.prototype = {
-             let id = global.connect('notify::stage-input-mode', Lang.bind(this,
-                 function () {
-                     global.disconnect(id);
--                    this._trayIcon.click(event);
-+                    this.trayIcon.click(event);
-                 }));
-             Main.overview.hide();
-         } else {
--            this._trayIcon.click(event);
-+            this.trayIcon.click(event);
-         }
-         return true;
-     },
-@@ -557,31 +583,25 @@ Source.prototype = {
-         if (this.app)
-             return;
- 
--        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid);
-+        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
-         if (!this.app)
-             return;
- 
-         // Only override the icon if we were previously using
-         // notification-based icons (ie, not a trayicon) or if it was unset before
--        if (!this._trayIcon) {
-+        if (!this.trayIcon) {
-             this.useNotificationIcon = false;
-             this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
-         }
-     },
- 
--    setTrayIcon: function(icon) {
--        this._setSummaryIcon(icon);
--        this.useNotificationIcon = false;
--        this._trayIcon = icon;
--    },
--
-     open: function(notification) {
-         this.destroyNonResidentNotifications();
-         this.openApp();
-     },
- 
-     _lastNotificationRemoved: function() {
--        if (!this._trayIcon)
-+        if (!this.trayIcon)
-             this.destroy();
-     },
- 
---
-cgit v0.9.0.2
diff --git a/extra/gnupg/PKGBUILD b/extra/gnupg/PKGBUILD
deleted file mode 100644
index 997075abb..000000000
--- a/extra/gnupg/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 127729 2011-06-17 22:03:38Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=gnupg
-pkgver=1.4.11
-pkgrel=3
-pkgdesc="GNU Privacy Guard - a PGP replacement tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
-install=gnupg.install
-url="http://www.gnupg.org/"
-md5sums=('411744e1ef8ce90b87938c4203f001f1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--libexecdir=/usr/lib \
-	--enable-noexecstack
-  make
-  #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check #All 27 tests passed
-}
-
-package () {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix fileconflict with gnupg2 pkg
-  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
-}
diff --git a/extra/gnupg/gnupg.install b/extra/gnupg/gnupg.install
deleted file mode 100644
index 5a6704716..000000000
--- a/extra/gnupg/gnupg.install
+++ /dev/null
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg1.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:
diff --git a/extra/gnupg2/PKGBUILD b/extra/gnupg2/PKGBUILD
deleted file mode 100644
index f237df630..000000000
--- a/extra/gnupg2/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134651 2011-08-07 10:18:11Z tpowa $
-# 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/extra/gnupg2/gnupg2-2.0.16-security.patch b/extra/gnupg2/gnupg2-2.0.16-security.patch
deleted file mode 100644
index b265c1532..000000000
--- a/extra/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/extra/gnupg2/gnupg2.install b/extra/gnupg2/gnupg2.install
deleted file mode 100644
index 27c121ffd..000000000
--- a/extra/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/extra/gpgme/PKGBUILD b/extra/gpgme/PKGBUILD
deleted file mode 100644
index 3593bb5e7..000000000
--- a/extra/gpgme/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $
-# 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=1
-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' 'gnupg2')
-install=${pkgname}.install
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-}
-md5sums=('90afa8436ce2b2683c001c824bd22601')
diff --git a/extra/gpgme/gpgme.install b/extra/gpgme/gpgme.install
deleted file mode 100644
index b54620d9a..000000000
--- a/extra/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/extra/gtk2/revert-iconview.patch b/extra/gtk2/revert-iconview.patch
deleted file mode 100644
index e16fc38e3..000000000
--- a/extra/gtk2/revert-iconview.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Wed, 16 Nov 2011 22:38:45 +0000
-Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
-
-It makes GtkIconView segfault on GTK 2.24.
-
-gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
-there's a layout queued anyway, so we wouldn't end up in the same
-situation causing the crash the original patch is supposed to fix.
-
-This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663138
----
-diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
-index 62877fa..54b3f3b 100644
---- a/gtk/gtkiconview.c
-+++ b/gtk/gtkiconview.c
-@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
- 
-       gtk_icon_view_build_items (icon_view);
- 
--      gtk_icon_view_layout (icon_view);
-+      gtk_icon_view_queue_layout (icon_view);
-     }
- 
-   g_object_notify (G_OBJECT (icon_view), "model");  
---
-cgit v0.9.0.2
diff --git a/extra/java7-openjdk/jconsole.desktop b/extra/java7-openjdk/jconsole.desktop
deleted file mode 100644
index ffbdd42ad..000000000
--- a/extra/java7-openjdk/jconsole.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications
-Exec=/usr/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
-Version=1.0
diff --git a/extra/java7-openjdk/policytool.desktop b/extra/java7-openjdk/policytool.desktop
deleted file mode 100644
index 702b44a6f..000000000
--- a/extra/java7-openjdk/policytool.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files
-Exec=/usr/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
-Version=1.0
diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD
deleted file mode 100644
index ef9e26785..000000000
--- a/extra/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 144651 2011-12-08 09:19:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-jovie'
-         'kdeaccessibility-kaccessible'
-         'kdeaccessibility-kmag'
-         'kdeaccessibility-kmousetool'
-         'kdeaccessibility-kmouth')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('03f4ac8234dcc49eb93eff3630f76e226e290fff')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeaccessibility-jovie() {
-	pkgdesc='A text to speech application'
-	depends=('kdebase-runtime' 'speech-dispatcher')
-    replaces=('kdeaccessibility-kttsd')
-	install='kdeaccessibility.install'
-	cd $srcdir/build/jovie
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/jovie/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
-    pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-    depends=('kdebase-runtime' 'speech-dispatcher')
-	install='kdeaccessibility.install'
-    cd $srcdir/build/kaccessible
-    make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
-	pkgdesc='Screen Magnifier'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmag/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmag
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmag/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
-	pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmousetool/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmousetool
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmousetool/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
-	pkgdesc='Speech Synthesizer Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmouth/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmouth
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmouth/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdeaccessibility/kdeaccessibility.install b/extra/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdeaccessibility/kdeaccessibility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdebase-runtime/libqzeitgeist08.patch b/extra/kdebase-runtime/libqzeitgeist08.patch
deleted file mode 100644
index f832cd8b2..000000000
--- a/extra/kdebase-runtime/libqzeitgeist08.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~	2011-10-29 15:46:55.003710230 +0000
-+++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt	2011-10-29 15:47:28.910716093 +0000
-@@ -21,7 +21,7 @@
-     )
- endif(Nepomuk_FOUND)
- 
--# Checking for QtZeitgeist
-+# Checking for QZeitgeist
- macro_optional_find_package(QZeitgeist)
- 
- if (QZEITGEIST_INCLUDE_DIR)
-@@ -30,8 +30,8 @@
- 
- macro_log_feature(
-         QZeitgeist_FOUND
--        "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
--        "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking")
-+        "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
-+        "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking")
- if (QZeitgeist_FOUND)
-     set(HAVE_QZEITGEIST 1)
-     include_directories(${QZEITGEIST_INCLUDE_DIR})
---- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~	2011-10-29 15:47:40.960836591 +0000
-+++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp	2011-10-29 15:48:57.034930073 +0000
-@@ -21,31 +21,31 @@
- 
- #ifndef HAVE_QZEITGEIST
- #ifdef __GNUC__
--    #warning "No QtZeitgeist, disabling desktop events processing"
-+    #warning "No QZeitgeist, disabling desktop events processing"
- #endif
- 
- #else // HAVE_QZEITGEIST
- 
- #include "ZeitgeistEventBackend.h"
- 
--#include <QtZeitgeist/QtZeitgeist>
--#include <QtZeitgeist/Interpretation>
--#include <QtZeitgeist/Manifestation>
-+#include <QZeitgeist/QZeitgeist>
-+#include <QZeitgeist/Interpretation>
-+#include <QZeitgeist/Manifestation>
- 
- static QString eventInterpretation(Event::Type type)
- {
-     switch (type) {
-         case Event::Accessed:
--            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
- 
-         case Event::Opened:
--            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
- 
-         case Event::Modified:
--            return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
-+            return QZeitgeist::Interpretation::Event::ZGModifyEvent;
- 
-         case Event::Closed:
--            return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
-+            return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
- 
-     }
- 
-@@ -57,23 +57,23 @@
- {
-     switch (reason) {
-         case Event::User:
--            return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+            return QZeitgeist::Manifestation::Event::ZGUserActivity;
- 
-         case Event::Heuristic:
--            return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
-+            return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
- 
-         case Event::Scheduled:
--            return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
-+            return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
- 
-         case Event::System:
--            return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
-+            return QZeitgeist::Manifestation::Event::ZGSystemNotification;
- 
-         case Event::World:
--            return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
-+            return QZeitgeist::Manifestation::Event::ZGWorldActivity;
-     }
- 
-     // shut up GCC
--    return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+    return QZeitgeist::Manifestation::Event::ZGUserActivity;
- }
- 
- static QString applicationUri(const QString & application)
-@@ -84,7 +84,6 @@
- 
- ZeitgeistEventBackend::ZeitgeistEventBackend()
- {
--    QtZeitgeist::init();
- }
- 
- void ZeitgeistEventBackend::addEvents(const EventList & events)
diff --git a/extra/kdebase-workspace/fix-powerprofiles.patch b/extra/kdebase-workspace/fix-powerprofiles.patch
deleted file mode 100644
index 309fcf3db..000000000
--- a/extra/kdebase-workspace/fix-powerprofiles.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dario Freddi <drf@kde.org>
-Date: Tue, 04 Oct 2011 14:09:09 +0000
-Subject: Use full config when reading settings
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=8d59876457387d1c72ca3626ae2d267adf100014
----
-Use full config when reading settings
-
-BUG: 267323
----
-
-
---- a/powerdevil/daemon/powerdevilcore.cpp
-+++ b/powerdevil/daemon/powerdevilcore.cpp
-@@ -88,7 +88,7 @@ void Core::onBackendReady()
- {
-     kDebug() << "Backend is ready, KDE Power Management system initialized";
- 
--    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);
-+    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig);
- 
-     // Is it brand new?
-     if (m_profilesConfig->groupList().isEmpty()) {
-
diff --git a/extra/kdebindings-smokegen/fix-crash.patch b/extra/kdebindings-smokegen/fix-crash.patch
deleted file mode 100644
index 5864da3f3..000000000
--- a/extra/kdebindings-smokegen/fix-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp
-diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp
---- smokegen-4.7.0/type_compiler.cpp.orig	2011-08-02 14:34:08.000000000 +0200
-+++ smokegen-4.7.0/type_compiler.cpp	2011-08-02 14:34:34.000000000 +0200
-@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
- 
- void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
- {
-+    if ( ! m_session->token_stream ) return;
-+    if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
-     if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
-         QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
-         pointerDepth.append(cv.first);
diff --git a/extra/kdegraphics-okular/staging-i686/PKGBUILD b/extra/kdegraphics-okular/staging-i686/PKGBUILD
deleted file mode 100644
index 8b08d240f..000000000
--- a/extra/kdegraphics-okular/staging-i686/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144119 2011-12-04 09:06:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.7.4
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install b/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
deleted file mode 100644
index 1bfbb3a18..000000000
--- a/extra/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 147759 2012-01-28 10:32:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
-        'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch')
-sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       # https://bugs.kde.org/show_bug.cgi?id=285028
-       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/extra/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/extra/kdelibs/fix-knotify-filepath.patch b/extra/kdelibs/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/extra/kdelibs/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/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/extra/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch
deleted file mode 100644
index bdcd39a6c..000000000
--- a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 5 Jan 2012 10:06:05 +0100
-Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
-
----
- cmake/modules/FindXine.cmake |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 37c58c6..d71969a 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
-   ${PC_LIBXINE_LIBRARY_DIRS}
-  )
- 
--find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
-+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
-    HINTS
-    ${PC_LIBXINE_PREFIX}/bin
- )
- 
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
--   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
-       set(XINE_VERSION_OK TRUE)
-       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
--- 
-1.7.8.2
-
diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/extra/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
deleted file mode 100644
index be1df93da..000000000
--- a/extra/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
-         'kdeutils-filelight'
-         'kdeutils-kcalc'
-         'kdeutils-kcharselect'
-         'kdeutils-kdf'
-         'kdeutils-kfloppy'
-         'kdeutils-kgpg'
-         'kdeutils-kremotecontrol'
-         'kdeutils-ktimer'
-         'kdeutils-kwallet'
-         'kdeutils-printer-applet'
-         'kdeutils-superkaramba'
-         'kdeutils-sweeper')
-pkgver=4.7.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
-	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
-	'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e')
-
-build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    
-    # Use Python2
-    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
-      kcharselect/kcharselect-generate-datafile.py \
-      superkaramba/examples/richtext/rtext.py
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdeutils-ark() {
-	pkgdesc='Archiving Tool'
-	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-	url="http://kde.org/applications/utilities/ark/"
-	cd $srcdir/build/ark
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ark/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
-	pkgdesc='View disk usage information'
-	depends=('kdebase-runtime' 'qimageblitz')
-	replaces=('filelight')
-	conflicts=('filelight')
-	install='kdeutils.install'
-	url="http://methylblue.com/filelight/"
-	cd $srcdir/build/filelight
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/filelight/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
-	pkgdesc='Scientific Calculator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcalc/"
-	cd $srcdir/build/kcalc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcalc/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
-	pkgdesc='Character Selector'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcharselect/"
-	cd $srcdir/build/kcharselect
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcharselect/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
-	pkgdesc='View Disk Usage'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kdiskfree/"
-	install='kdeutils.install'
-	cd $srcdir/build/kdf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kdf/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
-	pkgdesc='Floppy Formatter'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfloppy/"
-	install='kdeutils.install'
-	cd $srcdir/build/kfloppy
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kfloppy/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
-	pkgdesc='A GnuPG frontend'
-	depends=('kdepim-runtime' 'kde-agent')
-	url="http://kde.org/applications/utilities/kgpg"
-	install='kdeutils.install'
-	cd $srcdir/build/kgpg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgpg/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
-	pkgdesc='Configure your remote controls for use with applications'
-	replaces=('kdeutils-kdelirc')
-	conflicts=('kdeutils-kdelirc')
-	depends=('kdebase-workspace')
-	url="http://kde.org/applications/utilities/kremotecontrol"
-	install='kdeutils.install'
-	cd $srcdir/build/kremotecontrol
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kremotecontrol/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
-	pkgdesc='Countdown Launcher'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/ktimer"
-	install='kdeutils.install'
-	cd $srcdir/build/ktimer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ktimer/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
-	pkgdesc='Wallet Management Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kwalletmanager/"
-	install='kdeutils.install'
-	cd $srcdir/build/kwallet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwallet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
-	pkgdesc='System tray icon for managing print jobs'
-	depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/printer-applet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/printer-applet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-superkaramba() {
-	pkgdesc='An engine for cool desktop eyecandy'
-	depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
-	url="http://kde.org/applications/utilities/superkaramba"
-	install='kdeutils.install'
-	cd $srcdir/build/superkaramba
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
-	pkgdesc='System Cleaner'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/sweeper/"
-	cd $srcdir/build/sweeper
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/sweeper/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdeutils/kdeutils.install b/extra/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdeutils/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kmod/PKGBUILD b/extra/kmod/PKGBUILD
deleted file mode 100644
index 3b17c9f26..000000000
--- a/extra/kmod/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 145285 2011-12-21 02:42:53Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=2
-pkgrel=2
-pkgdesc="A set of tools to handle common tasks with Linux kernel modules"
-arch=('i686' 'x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
-license=('GPL2')
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz")
-md5sums=('6017364434377f6724f749d7a28c5d7a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --enable-zlib
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}
-
-# vim: ft=sh syn=sh et
diff --git a/extra/libassuan/PKGBUILD b/extra/libassuan/PKGBUILD
deleted file mode 100644
index ce2ce2fe0..000000000
--- a/extra/libassuan/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146533 2012-01-12 16:36:58Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=libassuan
-pkgver=2.0.3
-pkgrel=1
-pkgdesc="A IPC library used by some GnuPG related software"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnupg.org/related_software/libassuan"
-depends=('libgpg-error')
-options=('!libtool')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-install=libassuan.install
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('179d1918325fdb928c7bd90b8a514fc7')
diff --git a/extra/libassuan/libassuan.install b/extra/libassuan/libassuan.install
deleted file mode 100644
index 07e2672db..000000000
--- a/extra/libassuan/libassuan.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(assuan.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD
deleted file mode 100644
index 51f23e123..000000000
--- a/extra/libksba/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 134460 2011-08-04 06:38:08Z tpowa $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=libksba
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="A CMS and X.509 access library"
-arch=(i686 x86_64)
-license=('GPL')
-url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
-depends=('bash' 'libgpg-error' 'glibc')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-options=(!libtool)
-install=libksba.install
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$startdir/pkg install
-}
-md5sums=('e797f370b69b4dc776499d6a071ae137')
diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install
deleted file mode 100644
index 3715b8960..000000000
--- a/extra/libksba/libksba.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(ksba.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/libreoffice/PKGBUILD.next_stable34 b/extra/libreoffice/PKGBUILD.next_stable34
deleted file mode 100644
index 5b9dec2ab..000000000
--- a/extra/libreoffice/PKGBUILD.next_stable34
+++ /dev/null
@@ -1,925 +0,0 @@
-# $Id: PKGBUILD 145674 2011-12-26 20:12:16Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	#'libreoffice-extension-barcode' # 
-	'libreoffice-extension-diagram'
-	'libreoffice-extension-google-docs'
-	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-	'libreoffice-extension-nlpsolver'
-	'libreoffice-extension-ct2n'
-	'libreoffice-extension-numbertext'	
-	'libreoffice-extension-oooblogger'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
-	'libreoffice-extension-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-typo'
-	'libreoffice-extension-validator'
-	'libreoffice-extension-watch-window'
-	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.5.2
-pkgver=3.4.5rc2 # last expected release candidate (should become final ) - Release 3.4.5 	Week 2 , Jan 9 - Jan 15, 2012 
-pkgrel=1
-arch=('i686' 'x86_64')
-#_LO_tree="3.4"
-_OFFICEUPD="340"
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
-             'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the depends from libreoffice main pkg
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
-	     'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
-_additional_source_url="http://hg.services.openoffice.org/binaries"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_boost.diff
-	buildfix_ct2n.diff
-	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	#oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	#RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-	gcc462_buildfix.diff)
-noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
-         'c1e2dabdf4cfcd5957779014a7f9787e'
-         '79c9c7fc208e7f56af09f284f261a7da'
-         'c83a8a374d3d5cc83c6ac3b5ff613e46'
-         'fa64799ebad8cbd2c160ac2f87bd5599'
-         'b24fba57aa4185934e86a0a8db4a3433'
-         '4f98020088ab9b597fc21b617121bd47'
-         '3c3be7c5f923339c90b0d1d6ecad0243'
-         '3a0bb4bb096b7488533ed2ee466a2bc9'
-         'f2b180aa1eff3884b4ca81c048f1e327'
-         'a9af488ef92ad4442eafba874249c529'
-         'db6a67c96a9090bc5e21b64e202a984e'
-         'e00187ae0840e1f6a00fa3290cacf0d1'
-         '20fbf6cffd2b06e90a52105b75a57828'
-         '4af055f590732ec19a2534b2278ac49c'
-         'c84693796d2b1d9c8269425b1fa53aef'
-         'd4926dc27b6884656feec6753f4fdf22'
-         '770678ca19cca0f7985c1c82b2dccf48'
-         '97a1e3de430b124faf35bf334248ad53'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '185d60944ea767075d27247c3162b3bc'
-         '90401bca927835b6fbae4a707ed187c8'
-         '451ccf439a36a568653b024534669971'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '10600d04ee81014bc9b5cc04e615d799')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-	# move all LibO sources into one build directory
-	mkdir ${srcdir}/build && cd ${srcdir}/build
-	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
-	  mv ${srcdir}/$i/* .
-	done
-#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
-#	./bin/unpack-sources ${srcdir}/build
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-
-	cd ${srcdir}/build
-
-	# buildfixes & bugfixes
-	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
-	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	#patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	#patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
-#	patch -Np1 -i ${srcdir}/gcc462_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
-
-	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-#	if [ "$CARCH" = "x86_64" ]; then
-#	      EXTRAOPTS="--without-stlport"
-#	 else 
-#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-#	      # # avoid problems with ixion for now
-#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-#	fi
-
-	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-cairo\
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-ldap \
-		--enable-lockdown\
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-barcode \
-		--enable-ext-diagram \
-		--enable-ext-google-docs \
-		--enable-ext-hunart \
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-ext-nlpsolver \
-		--enable-ext-ct2n \
-		--enable-ext-numbertext \
-		--enable-ext-oooblogger \
-		--enable-ext-pdfimport \
-		--enable-ext-presenter-console \
-		--enable-ext-presenter-minimizer \
-		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-scripting-python \
-		--enable-ext-typo \
-		--enable-ext-validator \
-		--enable-ext-watch-window \
-		--enable-ext-wiki-publisher \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--with-system-libtextcat \
-		--with-external-libtextcat-data \
-		--with-openldap\
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mozilla\
-		--with-system-mythes\
-		--with-system-xrender-headers\
-		--with-system-headers\
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	unset MAKEFLAGS
-	./bootstrap
-	make
-	
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'libldap:          to get profiles via ldap'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/extra/mail-notification/gmime-2.4.patch b/extra/mail-notification/gmime-2.4.patch
deleted file mode 100644
index 0d16357fb..000000000
--- a/extra/mail-notification/gmime-2.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:28.000000000 +0300
-@@ -265,7 +265,7 @@
- 	    mime_message = g_mime_parser_construct_message(parser);
- 	    if (mime_message)
- 	      {
--		if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
-+		if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
- 		  {
- #if WITH_MOZILLA
- 		    type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
-diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:46:47.000000000 +0300
-@@ -167,7 +167,7 @@
- 	
-     const char *header;
- 
--    header = g_mime_message_get_header(mime_message, header_name);
-+    header = g_mime_object_get_header(mime_message, header_name);
-     if (header && mn_str_ishex(header))
-       return strtol(header, NULL, 16);
-     else
-diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c
---- mail-notification-5.4/jbsrc/jb.c	2008-05-22 19:47:04.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/jb.c	2008-12-23 14:43:09.000000000 +0300
-@@ -166,7 +166,7 @@
-   jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
--  jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
-+  jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
- 				"hotmail",
- 				"imap",
- 				"maildir",
-diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c
---- mail-notification-5.4/src/mn-message-mime.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-message-mime.c	2008-12-23 14:46:35.000000000 +0300
-@@ -33,12 +33,12 @@
-   g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
- 
-   /* SpamAssassin */
--  spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
-+  spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-   /* bogofilter */
--  spam = g_mime_message_get_header(mime_message, "X-Bogosity");
-+  spam = g_mime_object_get_header(mime_message, "X-Bogosity");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-@@ -89,7 +89,7 @@
-     {
-       const char *status;
- 
--      status = g_mime_message_get_header(mime_message, "Status");
-+      status = g_mime_object_get_header(mime_message, "Status");
-       if (status && strchr(status, 'R'))
- 	return NULL;		/* the message was read */
-       else if (status && strchr(status, 'O'))
diff --git a/extra/orage/fix-infinite-reminder.patch b/extra/orage/fix-infinite-reminder.patch
deleted file mode 100644
index 1dedbe902..000000000
--- a/extra/orage/fix-infinite-reminder.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 52a58e63cb039338d3365c83cb13e20acefba083 Mon Sep 17 00:00:00 2001
-From: Juha Kautto <juha@xfce.org>
-Date: Wed, 01 Jun 2011 12:26:22 +0000
-Subject: fixed Bug 7552 - Orage reminder duplicates infinitely
-
-When using default timezone floating, reminders repeated and never ended.
-Fixed this and prevented using floating as the default value. Using UTC
-instead.
-diff --git a/src/ical-code.c b/src/ical-code.c
-index c080bf2..e726103 100644
---- a/src/ical-code.c
-+++ b/src/ical-code.c
-@@ -233,7 +233,7 @@ gboolean xfical_set_local_timezone(gboolean testing)
- }
- 
- /*
-- * Basically standard says that timezone should be added alwasy
-+ * Basically standard says that timezone should be added always
-  * when it is used, but in real life these are not needed since
-  * all systems have their own timezone data, so let's save time
-  * and space and comment this out. 
-@@ -2587,7 +2587,7 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c
-         rel = icalparameter_get_related(trg_related_par);
-     else
-         rel = ICAL_RELATED_START;
--    per = ic_get_period(c, FALSE);
-+    per = ic_get_period(c, TRUE);
-     next_alarm_time = count_alarm_time(per, cur_time, trg.duration, rel);
-     alarm_start_diff = icaltime_subtract(per.stime, next_alarm_time);
-     /* we only have ctime for TODOs and only if todo has been completed.
-diff --git a/src/parameters.c b/src/parameters.c
-index 38407da..462fce2 100644
---- a/src/parameters.c
-+++ b/src/parameters.c
-@@ -440,7 +440,7 @@ static void timezone_button_clicked(GtkButton *button, gpointer user_data)
- 
-     if (!ORAGE_STR_EXISTS(g_par.local_timezone)) {
-         g_warning("timezone pressed: local timezone missing");
--        g_par.local_timezone = g_strdup("floating");
-+        g_par.local_timezone = g_strdup("UTC");
-     }
-     if (orage_timezone_button_clicked(button, GTK_WINDOW(itf->orage_dialog)
-             , &g_par.local_timezone, TRUE, g_par.local_timezone))
-@@ -501,16 +501,12 @@ static void create_parameter_dialog_main_setup_tab(Itf *dialog)
-             , dialog->timezone_frame, FALSE, FALSE, 5);
- 
-     dialog->timezone_button = gtk_button_new();
--    if (g_par.local_timezone) {
--        gtk_button_set_label(GTK_BUTTON(dialog->timezone_button)
--                , _(g_par.local_timezone));
--    }
--    else { /* we should never arrive here */
--        g_warning("parameters: timezone not set.");
--        g_par.local_timezone = g_strdup("floating");
--        gtk_button_set_label(GTK_BUTTON(dialog->timezone_button)
--                , _("floating"));
-+    if (!ORAGE_STR_EXISTS(g_par.local_timezone)) {
-+        g_warning("parameters: local timezone missing");
-+        g_par.local_timezone = g_strdup("UTC");
-     }
-+    gtk_button_set_label(GTK_BUTTON(dialog->timezone_button)
-+            , _(g_par.local_timezone));
-     gtk_box_pack_start(GTK_BOX(vbox)
-             , dialog->timezone_button, FALSE, FALSE, 5);
-     gtk_tooltips_set_tip(dialog->Tooltips, dialog->timezone_button
-@@ -1117,7 +1113,7 @@ static void init_default_timezone(void)
-     if (ORAGE_STR_EXISTS(g_par.local_timezone))
-         g_message(_("Default timezone set to %s."), g_par.local_timezone);
-     else {
--        g_par.local_timezone = g_strdup("floating");
-+        g_par.local_timezone = g_strdup("UTC");
-         g_message(_("Default timezone not found, please, set it manually."));
-     }
- }
-diff --git a/src/timezone_selection.c b/src/timezone_selection.c
-index 1bcb5be..518b83d 100644
---- a/src/timezone_selection.c
-+++ b/src/timezone_selection.c
-@@ -307,16 +307,31 @@ gboolean orage_timezone_button_clicked(GtkButton *button, GtkWindow *parent
-     tree = tz_button_create_view(details, store);
- 
-     /* show it */
--    if (check_ical)
--        window =  gtk_dialog_new_with_buttons(_("Pick timezone")
--                , parent
--                , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
--                , _("Change mode"), 1
--                , _("UTC"), 2
--                , _("floating"), 3
--                , _(local_tz), 4
--                , GTK_STOCK_OK, GTK_RESPONSE_ACCEPT
--                , NULL);
-+    if (check_ical) {
-+        if (local_tz == *tz) 
-+        /* We are actually setting the g_par parameter. In other words
-+           we are setting the global default timezone for Orage. This is
-+           done very seldom and we do not want to allow "floating" here.
-+           This test is ugly, but it is not worth an extra parameter. */
-+            window =  gtk_dialog_new_with_buttons(_("Pick timezone")
-+                    , parent
-+                    , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
-+                    , _("Change mode"), 1
-+                    , _("UTC"), 2
-+                    , _(local_tz), 4
-+                    , GTK_STOCK_OK, GTK_RESPONSE_ACCEPT
-+                    , NULL);
-+        else /* this is normal appointment */
-+            window =  gtk_dialog_new_with_buttons(_("Pick timezone")
-+                    , parent
-+                    , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
-+                    , _("Change mode"), 1
-+                    , _("UTC"), 2
-+                    , _("floating"), 3
-+                    , _(local_tz), 4
-+                    , GTK_STOCK_OK, GTK_RESPONSE_ACCEPT
-+                    , NULL);
-+    }
-     else
-         window =  gtk_dialog_new_with_buttons(_("Pick timezone")
-                 , parent
---
-cgit 
diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
deleted file mode 100644
index a2d4acf03..000000000
--- a/extra/oxygen-gtk/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 145044 2011-12-15 21:12:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=oxygen-gtk
-pkgver=1.1.6
-pkgrel=1
-pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
-arch=('i686' 'x86_64')
-url="http://kde-look.org/content/show.php/?content=136216"
-license=('LGPL')
-depends=('gtk2')
-makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('714cd895e276cfd20a43b406a78ae6af')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD
deleted file mode 100644
index 6aecd3c33..000000000
--- a/extra/pinentry/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 136330 2011-08-26 13:04:19Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pinentry
-pkgver=0.8.1
-pkgrel=3
-pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnupg.org/aegypten2"
-depends=('ncurses' 'libcap>=2.16')
-makedepends=('gtk2' 'qt')
-optdepends=('gtk2: for gtk2 backend'
-            'qt: for qt4 backend')  
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
-        gtk2-pinentry-segfault.patch)
-install=pinentry.install
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  for file in qt4/*.moc; do
-       /usr/bin/moc ${file/.moc/.h} > ${file}
-   done
-  ./configure --prefix=/usr \
-	--enable-pinentry-curses \
-        --disable-pinentry-gtk \
-        --disable-pinentry-qt \
-	--enable-pinentry-gtk2 \
-        --enable-pinentry-qt4 \
-	--enable-fallback-curses
-  make 
-  make DESTDIR=${pkgdir} install 
-  #rm ${pkgdir}/usr/share/info/dir 
-  #rm ${pkgdir}/usr/bin/pinentry 
-  #ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
-}
-md5sums=('81f99904daee5331eb6738408bb024b6'
-         'bd9888fafc56464b2c4deaad5b8edb07')
diff --git a/extra/pinentry/gtk2-pinentry-segfault.patch b/extra/pinentry/gtk2-pinentry-segfault.patch
deleted file mode 100644
index c0b9fb4ca..000000000
--- a/extra/pinentry/gtk2-pinentry-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2/pinentry-gtk-2.c.orig	2010-03-03 05:19:55.000000000 -0600
-+++ gtk+-2/pinentry-gtk-2.c	2010-07-07 00:11:30.413572124 -0500
-@@ -145,7 +145,7 @@
- {
-   gdk_keyboard_ungrab (gdk_event_get_time (event));
-   /* Unmake window transient for the root window.  */
--  gdk_window_set_transient_for (win->window, NULL);
-+  gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
- }
- 
- 
diff --git a/extra/pinentry/pinentry.install b/extra/pinentry/pinentry.install
deleted file mode 100644
index eed2c7124..000000000
--- a/extra/pinentry/pinentry.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(pinentry.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/pth/PKGBUILD b/extra/pth/PKGBUILD
deleted file mode 100644
index 7e2e6e5ee..000000000
--- a/extra/pth/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 140804 2011-10-19 15:35:55Z dreisner $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=pth
-pkgver=2.0.7
-pkgrel=4
-pkgdesc="The GNU Portable Threads."
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/pth/"
-license=('LGPL')
-depends=('glibc' 'awk')
-options=('!libtool' '!makeflags')
-source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig})
-sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee'
-          '8cb16dffbf15ba92bda8d08918eaf5995642fc38')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --mandir=/usr/share/man \
-              --disable-static \
-              --enable-shared \
-              --with-pic
-
-  sed -i "s|awk=''|awk=/bin/awk|g" shtool # "Cannot find a reasonable Awk"
-
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/smplayer-themes/ChangeLog b/extra/smplayer-themes/ChangeLog
deleted file mode 100644
index 3b8e487e1..000000000
--- a/extra/smplayer-themes/ChangeLog
+++ /dev/null
@@ -1,56 +0,0 @@
-2010-01-14  Ionut Biru <ionut@archlinux.ro>
-	* smplayer-themes 0.1.20-1
-	* Upstream update
-
-2009-03-13  Allan McRae <allan@archlinux.org>
-	* smplayer-themes 0.1.19-1
-	* Upstream update
-
-2008-12-20  Allan McRae <allan@archlinux.org>
-	* smplayer-themes 0.1.18-1
-	* Upstream update
-
-2008-09-27  Allan McRae <allan@archlinux.org>
-	* smplayer-themes 0.1.17-1
-	* Upstream update
-
-2008-06-22  Allan McRae <allan@archlinux.org>
-
-	* smplayer-themes 0.1.16-1
-	* Upstream update
-
-2008-05-23  Eric Belanger  <eric@archlinux.org>
-
-	* smplayer-themes 0.1.15-1
-	* Upstream update
-
-2008-01-24  Varun Acharya <varun@archlinux.org>
-	
-	* smplayer-themes-0.1.14-1 moved to extra
-
-2007-11-27  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* smplayer-themes-0.1.14-1
-	* version bump
-
-2007-10-24  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* smplayer-themes-0.1.13-1
-	* version bump
-
-2007-09-02  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* smplayer-themes-0.1.7-1
-	* version bump
-
-2007-07-12  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	* smplayer-themes-0.1.3-1	
-	* version bump
-
-2007-06-18  Eric Belanger (Snowman) <eric@archlinux.org>
-	* smplayer-themes-0.1.1-1
-	* fixed minor permission issue
-
-2007-05-30  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	* smplayer-themes-0.1.1-1
-	* version bump
diff --git a/extra/smplayer-themes/PKGBUILD b/extra/smplayer-themes/PKGBUILD
deleted file mode 100644
index 5f7be24bb..000000000
--- a/extra/smplayer-themes/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 63102 2010-01-14 17:20:39Z ibiru $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-pkgname=smplayer-themes
-pkgver=0.1.20
-pkgrel=1
-pkgdesc="Themes for smplayer"
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net/"
-license=('GPL')
-depends=('smplayer')
-source=(http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-themes-$pkgver.tar.bz2)
-md5sums=('384108911caded86306ddfdc047870ef')
-
-build() {
-     cd ${srcdir}/${pkgname}-${pkgver}
-     make PREFIX=${pkgdir}/usr CONF_PREFIX= || return 1
-     make PREFIX=${pkgdir}/usr install
-}
diff --git a/extra/subversion/svnmerge.py b/extra/subversion/svnmerge.py
deleted file mode 100644
index d8931648f..000000000
--- a/extra/subversion/svnmerge.py
+++ /dev/null
@@ -1,2370 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-# Copyright (c) 2005, Giovanni Bajo
-# Copyright (c) 2004-2005, Awarix, Inc.
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-#
-# Author: Archie Cobbs <archie at awarix dot com>
-# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com>
-#
-# Acknowledgments:
-#   John Belmonte <john at neggie dot net> - metadata and usability
-#     improvements
-#   Blair Zajac <blair at orcaware dot com> - random improvements
-#   Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive
-#     merging support
-#   Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple
-#     location identifier formats
-#
-# $HeadURL$
-# $LastChangedDate$
-# $LastChangedBy$
-# $LastChangedRevision$
-#
-# Requisites:
-# svnmerge.py has been tested with all SVN major versions since 1.1 (both
-# client and server). It is unknown if it works with previous versions.
-#
-# Differences from svnmerge.sh:
-# - More portable: tested as working in FreeBSD and OS/2.
-# - Add double-verbose mode, which shows every svn command executed (-v -v).
-# - "svnmerge avail" now only shows commits in source, not also commits in
-#   other parts of the repository.
-# - Add "svnmerge block" to flag some revisions as blocked, so that
-#   they will not show up anymore in the available list.  Added also
-#   the complementary "svnmerge unblock".
-# - "svnmerge avail" has grown two new options:
-#   -B to display a list of the blocked revisions
-#   -A to display both the blocked and the available revisions.
-# - Improved generated commit message to make it machine parsable even when
-#   merging commits which are themselves merges.
-# - Add --force option to skip working copy check
-# - Add --record-only option to "svnmerge merge" to avoid performing
-#   an actual merge, yet record that a merge happened.
-# - Can use a variety of location-identifier formats
-#
-# TODO:
-#  - Add "svnmerge avail -R": show logs in reverse order
-#
-# Information for Hackers:
-#
-# Identifiers for branches:
-#  A branch is identified in three ways within this source:
-#  - as a working copy (variable name usually includes 'dir')
-#  - as a fully qualified URL
-#  - as a path identifier (an opaque string indicating a particular path
-#    in a particular repository; variable name includes 'pathid')
-#  A "target" is generally user-specified, and may be a working copy or
-#  a URL.
-
-import sys, os, getopt, re, types, tempfile, time, locale
-from bisect import bisect
-from xml.dom import pulldom
-
-NAME = "svnmerge"
-if not hasattr(sys, "version_info") or sys.version_info < (2, 0):
-    error("requires Python 2.0 or newer")
-
-# Set up the separator used to separate individual log messages from
-# each revision merged into the target location.  Also, create a
-# regular expression that will find this same separator in already
-# committed log messages, so that the separator used for this run of
-# svnmerge.py will have one more LOG_SEPARATOR appended to the longest
-# separator found in all the commits.
-LOG_SEPARATOR = 8 * '.'
-LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR),
-                              re.MULTILINE)
-
-# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX.
-LOG_LINE_PREFIX = 2 * ' '
-
-# Set python to the default locale as per environment settings, same as svn
-# TODO we should really parse config and if log-encoding is specified, set
-# the locale to match that encoding
-locale.setlocale(locale.LC_ALL, '')
-
-# We want the svn output (such as svn info) to be non-localized
-# Using LC_MESSAGES should not affect localized output of svn log, for example
-if os.environ.has_key("LC_ALL"):
-    del os.environ["LC_ALL"]
-os.environ["LC_MESSAGES"] = "C"
-
-###############################################################################
-# Support for older Python versions
-###############################################################################
-
-# True/False constants are Python 2.2+
-try:
-    True, False
-except NameError:
-    True, False = 1, 0
-
-def lstrip(s, ch):
-    """Replacement for str.lstrip (support for arbitrary chars to strip was
-    added in Python 2.2.2)."""
-    i = 0
-    try:
-        while s[i] == ch:
-            i = i+1
-        return s[i:]
-    except IndexError:
-        return ""
-
-def rstrip(s, ch):
-    """Replacement for str.rstrip (support for arbitrary chars to strip was
-    added in Python 2.2.2)."""
-    try:
-        if s[-1] != ch:
-            return s
-        i = -2
-        while s[i] == ch:
-            i = i-1
-        return s[:i+1]
-    except IndexError:
-        return ""
-
-def strip(s, ch):
-    """Replacement for str.strip (support for arbitrary chars to strip was
-    added in Python 2.2.2)."""
-    return lstrip(rstrip(s, ch), ch)
-
-def rsplit(s, sep, maxsplits=0):
-    """Like str.rsplit, which is Python 2.4+ only."""
-    L = s.split(sep)
-    if not 0 < maxsplits <= len(L):
-        return L
-    return [sep.join(L[0:-maxsplits])] + L[-maxsplits:]
-
-###############################################################################
-
-def kwextract(s):
-    """Extract info from a svn keyword string."""
-    try:
-        return strip(s, "$").strip().split(": ")[1]
-    except IndexError:
-        return "<unknown>"
-
-__revision__ = kwextract('$Rev$')
-__date__ = kwextract('$Date$')
-
-# Additional options, not (yet?) mapped to command line flags
-default_opts = {
-    "svn": "svn",
-    "prop": NAME + "-integrated",
-    "block-prop": NAME + "-blocked",
-    "commit-verbose": True,
-    "verbose": 0,
-}
-logs = {}
-
-def console_width():
-    """Get the width of the console screen (if any)."""
-    try:
-        return int(os.environ["COLUMNS"])
-    except (KeyError, ValueError):
-        pass
-
-    try:
-        # Call the Windows API (requires ctypes library)
-        from ctypes import windll, create_string_buffer
-        h = windll.kernel32.GetStdHandle(-11)
-        csbi = create_string_buffer(22)
-        res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi)
-        if res:
-            import struct
-            (bufx, bufy,
-             curx, cury, wattr,
-             left, top, right, bottom,
-             maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw)
-            return right - left + 1
-    except ImportError:
-        pass
-
-    # Parse the output of stty -a
-    if os.isatty(1):
-        out = os.popen("stty -a").read()
-        m = re.search(r"columns (\d+);", out)
-        if m:
-            return int(m.group(1))
-
-    # sensible default
-    return 80
-
-def error(s):
-    """Subroutine to output an error and bail."""
-    print >> sys.stderr, "%s: %s" % (NAME, s)
-    sys.exit(1)
-
-def report(s):
-    """Subroutine to output progress message, unless in quiet mode."""
-    if opts["verbose"]:
-        print "%s: %s" % (NAME, s)
-
-def prefix_lines(prefix, lines):
-    """Given a string representing one or more lines of text, insert the
-    specified prefix at the beginning of each line, and return the result.
-    The input must be terminated by a newline."""
-    assert lines[-1] == "\n"
-    return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n"
-
-def recode_stdout_to_file(s):
-    if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \
-            or sys.stdout.encoding is None:
-        return s
-    u = s.decode(sys.stdout.encoding)
-    return u.encode(locale.getdefaultlocale()[1])
-
-class LaunchError(Exception):
-    """Signal a failure in execution of an external command. Parameters are the
-    exit code of the process, the original command line, and the output of the
-    command."""
-
-try:
-    """Launch a sub-process. Return its output (both stdout and stderr),
-    optionally split by lines (if split_lines is True). Raise a LaunchError
-    exception if the exit code of the process is non-zero (failure).
-
-    This function has two implementations, one based on subprocess (preferred),
-    and one based on popen (for compatibility).
-    """
-    import subprocess
-    import shlex
-
-    def launch(cmd, split_lines=True):
-        # Requiring python 2.4 or higher, on some platforms we get
-        # much faster performance from the subprocess module (where python
-        # doesn't try to close an exhorbitant number of file descriptors)
-        stdout = ""
-        stderr = ""
-        try:
-            if os.name == 'nt':
-                p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \
-                                     close_fds=False, stderr=subprocess.PIPE)
-            else:
-                # Use shlex to break up the parameters intelligently,
-                # respecting quotes. shlex can't handle unicode.
-                args = shlex.split(cmd.encode('ascii'))
-                p = subprocess.Popen(args, stdout=subprocess.PIPE, \
-                                     close_fds=False, stderr=subprocess.PIPE)
-            stdoutAndErr = p.communicate()
-            stdout = stdoutAndErr[0]
-            stderr = stdoutAndErr[1]
-        except OSError, inst:
-            # Using 1 as failure code; should get actual number somehow? For
-            # examples see svnmerge_test.py's TestCase_launch.test_failure and
-            # TestCase_launch.test_failurecode.
-            raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst))
-
-        if p.returncode == 0:
-            if split_lines:
-                # Setting keepends=True for compatibility with previous logic
-                # (where file.readlines() preserves newlines)
-                return stdout.splitlines(True)
-            else:
-                return stdout
-        else:
-            raise LaunchError(p.returncode, cmd, stdout + stderr)
-except ImportError:
-    # support versions of python before 2.4 (slower on some systems)
-    def launch(cmd, split_lines=True):
-        if os.name not in ['nt', 'os2']:
-            import popen2
-            p = popen2.Popen4(cmd)
-            p.tochild.close()
-            if split_lines:
-                out = p.fromchild.readlines()
-            else:
-                out = p.fromchild.read()
-            ret = p.wait()
-            if ret == 0:
-                ret = None
-            else:
-                ret >>= 8
-        else:
-            i,k = os.popen4(cmd)
-            i.close()
-            if split_lines:
-                out = k.readlines()
-            else:
-                out = k.read()
-            ret = k.close()
-
-        if ret is None:
-            return out
-        raise LaunchError(ret, cmd, out)
-
-def launchsvn(s, show=False, pretend=False, **kwargs):
-    """Launch SVN and grab its output."""
-    username = password = configdir = ""
-    if opts.get("username", None):
-        username = "--username=" + opts["username"]
-    if opts.get("password", None):
-        password = "--password=" + opts["password"]
-    if opts.get("config-dir", None):
-        configdir = "--config-dir=" + opts["config-dir"]
-    cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive",
-                                 username, password, configdir, s]))
-    if show or opts["verbose"] >= 2:
-        print cmd
-    if pretend:
-        return None
-    return launch(cmd, **kwargs)
-
-def svn_command(s):
-    """Do (or pretend to do) an SVN command."""
-    out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"],
-                    pretend=opts["dry-run"],
-                    split_lines=False)
-    if not opts["dry-run"]:
-        print out
-
-def check_dir_clean(dir):
-    """Check the current status of dir for local mods."""
-    if opts["force"]:
-        report('skipping status check because of --force')
-        return
-    report('checking status of "%s"' % dir)
-
-    # Checking with -q does not show unversioned files or external
-    # directories.  Though it displays a debug message for external
-    # directories, after a blank line.  So, practically, the first line
-    # matters: if it's non-empty there is a modification.
-    out = launchsvn("status -q %s" % dir)
-    if out and out[0].strip():
-        error('"%s" has local modifications; it must be clean' % dir)
-
-class PathIdentifier:
-    """Abstraction for a path identifier, so that we can start talking
-    about it before we know the form that it takes in the properties (its
-    external_form).  Objects are referenced in the class variable 'locobjs',
-    keyed by all known forms."""
-    
-    # a map of UUID (or None) to repository root URL.
-    repo_hints = {}
-
-    # a map from any known string form to the corresponding PathIdentifier
-    locobjs = {}
-
-    def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None):
-        self.repo_relative_path = repo_relative_path
-        self.uuid = uuid
-        self.url = url
-        self.external_form = external_form
-
-    def __repr__(self):
-        return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>'
-
-    def __str__(self):
-        """Return a printable string representation"""
-        if self.external_form:
-            return self.external_form
-        if self.url:
-            return self.format('url')
-        if self.uuid:
-            return self.format('uuid')
-        return self.format('path')
-
-    def from_pathid(pathid_str):
-        """convert pathid_str to a PathIdentifier"""
-        if not PathIdentifier.locobjs.has_key(pathid_str):
-            if is_url(pathid_str):
-                # we can determine every form; PathIdentifier.hint knows how to do that
-                PathIdentifier.hint(pathid_str)
-            elif pathid_str[:7] == 'uuid://':
-                mo = re.match('uuid://([^/]*)(.*)', pathid_str)
-                if not mo:
-                    error("Invalid path identifier '%s'" % pathid_str)
-                uuid, repo_relative_path = mo.groups()
-                pathid = PathIdentifier(repo_relative_path, uuid=uuid)
-                # we can cache this by uuid:// pathid and by repo-relative path
-                PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid
-            elif pathid_str and pathid_str[0] == '/':
-                # strip any trailing slashes
-                pathid_str = pathid_str.rstrip('/')
-                pathid = PathIdentifier(repo_relative_path=pathid_str)
-                # we can only cache this by repo-relative path
-                PathIdentifier.locobjs[pathid_str] = pathid
-            else:
-                error("Invalid path identifier '%s'" % pathid_str)
-        return PathIdentifier.locobjs[pathid_str]
-    from_pathid = staticmethod(from_pathid)
-
-    def from_target(target):
-        """Convert a target (either a working copy path or an URL) into a
-        path identifier."""
-        # prime the cache first if we don't know about this target yet
-        if not PathIdentifier.locobjs.has_key(target):
-            PathIdentifier.hint(target)
-
-        try:
-            return PathIdentifier.locobjs[target]
-        except KeyError:
-            error("Could not recognize path identifier '%s'" % target)
-    from_target = staticmethod(from_target)
-
-    def hint(target):
-        """Cache some information about target, as it may be referenced by
-        repo-relative path in subversion properties; the cache can help to
-        expand such a relative path to a full path identifier."""
-        if PathIdentifier.locobjs.has_key(target): return
-        if not is_url(target) and not is_wc(target): return
-
-        url = target_to_url(target)
-
-        root = get_repo_root(url)
-        assert root[-1] != "/"
-        assert url[:len(root)] == root, "url=%r, root=%r" % (url, root)
-        repo_relative_path = url[len(root):]
-
-        try:
-            uuid = get_svninfo(target)['Repository UUID']
-            uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path)
-        except KeyError:
-            uuid = None
-            uuid_pathid = None
-
-        locobj = PathIdentifier.locobjs.get(url) or \
-                 (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid))
-        if not locobj:
-            locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url)
-
-        PathIdentifier.repo_hints[uuid] = root # (uuid may be None)
-
-        PathIdentifier.locobjs[target] = locobj
-        PathIdentifier.locobjs[url] = locobj
-        if uuid_pathid:
-            PathIdentifier.locobjs[uuid_pathid] = locobj
-        if not PathIdentifier.locobjs.has_key(repo_relative_path):
-            PathIdentifier.locobjs[repo_relative_path] = locobj
-    hint = staticmethod(hint)
-
-    def format(self, fmt):
-        if fmt == 'path':
-            return self.repo_relative_path
-        elif fmt == 'uuid':
-            return "uuid://%s%s" % (self.uuid, self.repo_relative_path)
-        elif fmt == 'url':
-            return self.url
-        else:
-            error("Unkonwn path type '%s'" % fmt)
-
-    def match_substring(self, str):
-        """Test whether str is a substring of any representation of this
-        PathIdentifier."""
-        if self.repo_relative_path.find(str) >= 0:
-            return True
-
-        if self.uuid:
-            if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0:
-                return True
-
-        if self.url:
-            if (self.url + self.repo_relative_path).find(str) >= 0:
-                return True
-
-        return False
-
-    def get_url(self):
-        """Convert a pathid into a URL.  If this is not possible, error out."""
-        if self.url:
-            return self.url
-        # if we have a uuid and happen to know the URL for it, use that
-        elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid):
-            self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path
-            PathIdentifier.locobjs[self.url] = self
-            return self.url
-        # if we've only seen one rep, use that (a guess, but an educated one)
-        elif not self.uuid and len(PathIdentifier.repo_hints) == 1:
-            uuid, root = PathIdentifier.repo_hints.items()[0]
-            if uuid:
-                self.uuid = uuid
-                PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self
-            self.url = root + self.repo_relative_path
-            PathIdentifier.locobjs[self.url] = self
-            report("Guessing that '%s' refers to '%s'" % (self, self.url))
-            return self.url
-        else:
-            error("Cannot determine URL for '%s'; " % self +
-                  "Explicit source argument (-S/--source) required.\n")
-
-class RevisionLog:
-    """
-    A log of the revisions which affected a given URL between two
-    revisions.
-    """
-
-    def __init__(self, url, begin, end, find_propchanges=False):
-        """
-        Create a new RevisionLog object, which stores, in self.revs, a list
-        of the revisions which affected the specified URL between begin and
-        end. If find_propchanges is True, self.propchange_revs will contain a
-        list of the revisions which changed properties directly on the
-        specified URL. URL must be the URL for a directory in the repository.
-        """
-        self.url = url
-
-        # Setup the log options (--quiet, so we don't show log messages)
-        log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url)
-        if find_propchanges:
-            # The --verbose flag lets us grab merge tracking information
-            # by looking at propchanges
-            log_opts = "--verbose " + log_opts
-
-        # Read the log to look for revision numbers and merge-tracking info
-        self.revs = []
-        self.propchange_revs = []
-        repos_pathid = PathIdentifier.from_target(url)
-        for chg in SvnLogParser(launchsvn("log %s" % log_opts,
-                                          split_lines=False)):
-            self.revs.append(chg.revision())
-            for p in chg.paths():
-                if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path:
-                    self.propchange_revs.append(chg.revision())
-
-        # Save the range of the log
-        self.begin = int(begin)
-        if end == "HEAD":
-            # If end is not provided, we do not know which is the latest
-            # revision in the repository. So we set 'end' to the latest
-            # known revision.
-            self.end = self.revs[-1]
-        else:
-            self.end = int(end)
-
-        self._merges = None
-        self._blocks = None
-
-    def merge_metadata(self):
-        """
-        Return a VersionedProperty object, with a cached view of the merge
-        metadata in the range of this log.
-        """
-
-        # Load merge metadata if necessary
-        if not self._merges:
-            self._merges = VersionedProperty(self.url, opts["prop"])
-            self._merges.load(self)
-
-        return self._merges
-
-    def block_metadata(self):
-        if not self._blocks:
-            self._blocks = VersionedProperty(self.url, opts["block-prop"])
-            self._blocks.load(self)
-
-        return self._blocks
-
-
-class VersionedProperty:
-    """
-    A read-only, cached view of a versioned property.
-
-    self.revs contains a list of the revisions in which the property changes.
-    self.values stores the new values at each corresponding revision. If the
-    value of the property is unknown, it is set to None.
-
-    Initially, we set self.revs to [0] and self.values to [None]. This
-    indicates that, as of revision zero, we know nothing about the value of
-    the property.
-
-    Later, if you run self.load(log), we cache the value of this property over
-    the entire range of the log by noting each revision in which the property
-    was changed. At the end of the range of the log, we invalidate our cache
-    by adding the value "None" to our cache for any revisions which fall out
-    of the range of our log.
-
-    Once self.revs and self.values are filled, we can find the value of the
-    property at any arbitrary revision using a binary search on self.revs.
-    Once we find the last revision during which the property was changed,
-    we can lookup the associated value in self.values. (If the associated
-    value is None, the associated value was not cached and we have to do
-    a full propget.)
-
-    An example: We know that the 'svnmerge' property was added in r10, and
-    changed in r21. We gathered log info up until r40.
-
-    revs = [0, 10, 21, 40]
-    values = [None, "val1", "val2", None]
-
-    What these values say:
-    - From r0 to r9, we know nothing about the property.
-    - In r10, the property was set to "val1". This property stayed the same
-      until r21, when it was changed to "val2".
-    - We don't know what happened after r40.
-    """
-
-    def __init__(self, url, name):
-        """View the history of a versioned property at URL with name"""
-        self.url = url
-        self.name = name
-
-        # We know nothing about the value of the property. Setup revs
-        # and values to indicate as such.
-        self.revs = [0]
-        self.values = [None]
-
-        # We don't have any revisions cached
-        self._initial_value = None
-        self._changed_revs = []
-        self._changed_values = []
-
-    def load(self, log):
-        """
-        Load the history of property changes from the specified
-        RevisionLog object.
-        """
-
-        # Get the property value before the range of the log
-        if log.begin > 1:
-            self.revs.append(log.begin-1)
-            try:
-                self._initial_value = self.raw_get(log.begin-1)
-            except LaunchError:
-                # The specified URL might not exist before the
-                # range of the log. If so, we can safely assume
-                # that the property was empty at that time.
-                self._initial_value = { }
-            self.values.append(self._initial_value)
-        else:
-            self._initial_value = { }
-            self.values[0] = self._initial_value
-
-        # Cache the property values in the log range
-        old_value = self._initial_value
-        for rev in log.propchange_revs:
-            new_value = self.raw_get(rev)
-            if new_value != old_value:
-                self._changed_revs.append(rev)
-                self._changed_values.append(new_value)
-                self.revs.append(rev)
-                self.values.append(new_value)
-                old_value = new_value
-
-        # Indicate that we know nothing about the value of the property
-        # after the range of the log.
-        if log.revs:
-            self.revs.append(log.end+1)
-            self.values.append(None)
-
-    def raw_get(self, rev=None):
-        """
-        Get the property at revision REV. If rev is not specified, get
-        the property at revision HEAD.
-        """
-        return get_revlist_prop(self.url, self.name, rev)
-
-    def get(self, rev=None):
-        """
-        Get the property at revision REV. If rev is not specified, get
-        the property at revision HEAD.
-        """
-
-        if rev is not None:
-
-            # Find the index using a binary search
-            i = bisect(self.revs, rev) - 1
-
-            # Return the value of the property, if it was cached
-            if self.values[i] is not None:
-                return self.values[i]
-
-        # Get the current value of the property
-        return self.raw_get(rev)
-
-    def changed_revs(self, key=None):
-        """
-        Get a list of the revisions in which the specified dictionary
-        key was changed in this property. If key is not specified,
-        return a list of revisions in which any key was changed.
-        """
-        if key is None:
-            return self._changed_revs
-        else:
-            changed_revs = []
-            old_val = self._initial_value
-            for rev, val in zip(self._changed_revs, self._changed_values):
-                if val.get(key) != old_val.get(key):
-                    changed_revs.append(rev)
-                    old_val = val
-            return changed_revs
-
-    def initialized_revs(self):
-        """
-        Get a list of the revisions in which keys were added or
-        removed in this property.
-        """
-        initialized_revs = []
-        old_len = len(self._initial_value)
-        for rev, val in zip(self._changed_revs, self._changed_values):
-            if len(val) != old_len:
-                initialized_revs.append(rev)
-                old_len = len(val)
-        return initialized_revs
-
-class RevisionSet:
-    """
-    A set of revisions, held in dictionary form for easy manipulation. If we
-    were to rewrite this script for Python 2.3+, we would subclass this from
-    set (or UserSet).  As this class does not include branch
-    information, it's assumed that one instance will be used per
-    branch.
-    """
-    def __init__(self, parm):
-        """Constructs a RevisionSet from a string in property form, or from
-        a dictionary whose keys are the revisions. Raises ValueError if the
-        input string is invalid."""
-
-        self._revs = {}
-
-        revision_range_split_re = re.compile('[-:]')
-
-        if isinstance(parm, types.DictType):
-            self._revs = parm.copy()
-        elif isinstance(parm, types.ListType):
-            for R in parm:
-                self._revs[int(R)] = 1
-        else:
-            parm = parm.strip()
-            if parm:
-                for R in parm.split(","):
-                    rev_or_revs = re.split(revision_range_split_re, R)
-                    if len(rev_or_revs) == 1:
-                        self._revs[int(rev_or_revs[0])] = 1
-                    elif len(rev_or_revs) == 2:
-                        for rev in range(int(rev_or_revs[0]),
-                                         int(rev_or_revs[1])+1):
-                            self._revs[rev] = 1
-                    else:
-                        raise ValueError, 'Ill formatted revision range: ' + R
-
-    def sorted(self):
-        revnums = self._revs.keys()
-        revnums.sort()
-        return revnums
-
-    def normalized(self):
-        """Returns a normalized version of the revision set, which is an
-        ordered list of couples (start,end), with the minimum number of
-        intervals."""
-        revnums = self.sorted()
-        revnums.reverse()
-        ret = []
-        while revnums:
-            s = e = revnums.pop()
-            while revnums and revnums[-1] in (e, e+1):
-                e = revnums.pop()
-            ret.append((s, e))
-        return ret
-
-    def __str__(self):
-        """Convert the revision set to a string, using its normalized form."""
-        L = []
-        for s,e in self.normalized():
-            if s == e:
-                L.append(str(s))
-            else:
-                L.append(str(s) + "-" + str(e))
-        return ",".join(L)
-
-    def __contains__(self, rev):
-        return self._revs.has_key(rev)
-
-    def __sub__(self, rs):
-        """Compute subtraction as in sets."""
-        revs = {}
-        for r in self._revs.keys():
-            if r not in rs:
-                revs[r] = 1
-        return RevisionSet(revs)
-
-    def __and__(self, rs):
-        """Compute intersections as in sets."""
-        revs = {}
-        for r in self._revs.keys():
-            if r in rs:
-                revs[r] = 1
-        return RevisionSet(revs)
-
-    def __nonzero__(self):
-        return len(self._revs) != 0
-
-    def __len__(self):
-        """Return the number of revisions in the set."""
-        return len(self._revs)
-
-    def __iter__(self):
-        return iter(self.sorted())
-
-    def __or__(self, rs):
-        """Compute set union."""
-        revs = self._revs.copy()
-        revs.update(rs._revs)
-        return RevisionSet(revs)
-
-def merge_props_to_revision_set(merge_props, pathid):
-    """A converter which returns a RevisionSet instance containing the
-    revisions from PATH as known to BRANCH_PROPS.  BRANCH_PROPS is a
-    dictionary of pathid -> revision set branch integration information
-    (as returned by get_merge_props())."""
-    if not merge_props.has_key(pathid):
-        error('no integration info available for path "%s"' % pathid)
-    return RevisionSet(merge_props[pathid])
-
-def dict_from_revlist_prop(propvalue):
-    """Given a property value as a string containing per-source revision
-    lists, return a dictionary whose key is a source path identifier
-    and whose value is the revisions for that source."""
-    prop = {}
-
-    # Multiple sources are separated by any whitespace.
-    for L in propvalue.split():
-        # We use rsplit to play safe and allow colons in pathids.
-        pathid_str, revs = rsplit(L.strip(), ":", 1)
-
-        pathid = PathIdentifier.from_pathid(pathid_str)
-
-        # cache the "external" form we saw
-        pathid.external_form = pathid_str
-
-        prop[pathid] = revs
-    return prop
-
-def get_revlist_prop(url_or_dir, propname, rev=None):
-    """Given a repository URL or working copy path and a property
-    name, extract the values of the property which store per-source
-    revision lists and return a dictionary whose key is a source path
-    identifier, and whose value is the revisions for that source."""
-
-    # Note that propget does not return an error if the property does
-    # not exist, it simply does not output anything. So we do not need
-    # to check for LaunchError here.
-    args = '--strict "%s" "%s"' % (propname, url_or_dir)
-    if rev:
-        args = '-r %s %s' % (rev, args)
-    out = launchsvn('propget %s' % args, split_lines=False)
-
-    return dict_from_revlist_prop(out)
-
-def get_merge_props(dir):
-    """Extract the merged revisions."""
-    return get_revlist_prop(dir, opts["prop"])
-
-def get_block_props(dir):
-    """Extract the blocked revisions."""
-    return get_revlist_prop(dir, opts["block-prop"])
-
-def get_blocked_revs(dir, source_pathid):
-    p = get_block_props(dir)
-    if p.has_key(source_pathid):
-        return RevisionSet(p[source_pathid])
-    return RevisionSet("")
-
-def format_merge_props(props, sep=" "):
-    """Formats the hash PROPS as a string suitable for use as a
-    Subversion property value."""
-    assert sep in ["\t", "\n", " "]   # must be a whitespace
-    props = props.items()
-    props.sort()
-    L = []
-    for h, r in props:
-        L.append("%s:%s" % (h, r))
-    return sep.join(L)
-
-def _run_propset(dir, prop, value):
-    """Set the property 'prop' of directory 'dir' to value 'value'. We go
-    through a temporary file to not run into command line length limits."""
-    try:
-        fd, fname = tempfile.mkstemp()
-        f = os.fdopen(fd, "wb")
-    except AttributeError:
-        # Fallback for Python <= 2.3 which does not have mkstemp (mktemp
-        # suffers from race conditions. Not that we care...)
-        fname = tempfile.mktemp()
-        f = open(fname, "wb")
-
-    try:
-        f.write(value)
-        f.close()
-        report("property data written to temp file: %s" % value)
-        svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir))
-    finally:
-        os.remove(fname)
-
-def set_props(dir, name, props):
-    props = format_merge_props(props)
-    if props:
-        _run_propset(dir, name, props)
-    else:
-        # Check if NAME exists on DIR before trying to delete it.
-        # As of 1.6 propdel no longer supports deleting a
-        # non-existent property.
-        out = launchsvn('propget "%s" "%s"' % (name, dir))
-        if out:
-            svn_command('propdel "%s" "%s"' % (name, dir))
-
-def set_merge_props(dir, props):
-    set_props(dir, opts["prop"], props)
-
-def set_block_props(dir, props):
-    set_props(dir, opts["block-prop"], props)
-
-def set_blocked_revs(dir, source_pathid, revs):
-    props = get_block_props(dir)
-    if revs:
-        props[source_pathid] = str(revs)
-    elif props.has_key(source_pathid):
-        del props[source_pathid]
-    set_block_props(dir, props)
-
-def is_url(url):
-    """Check if url looks like a valid url."""
-    return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid'
-
-def check_url(url):
-    """Similar to is_url, but actually invoke get_svninfo to find out"""
-    return get_svninfo(url) != {}
-
-def is_pathid(pathid):
-    return isinstance(pathid, PathIdentifier)
-
-def is_wc(dir):
-    """Check if a directory is a working copy."""
-    return os.path.isdir(os.path.join(dir, ".svn")) or \
-           os.path.isdir(os.path.join(dir, "_svn"))
-
-_cache_svninfo = {}
-def get_svninfo(target):
-    """Extract the subversion information for a target (through 'svn info').
-    This function uses an internal cache to let clients query information
-    many times."""
-    if _cache_svninfo.has_key(target):
-        return _cache_svninfo[target]
-    info = {}
-    for L in launchsvn('info "%s"' % target):
-        L = L.strip()
-        if not L:
-            continue
-        key, value = L.split(": ", 1)
-        info[key] = value.strip()
-    _cache_svninfo[target] = info
-    return info
-
-def target_to_url(target):
-    """Convert working copy path or repos URL to a repos URL."""
-    if is_wc(target):
-        info = get_svninfo(target)
-        return info["URL"]
-    return target
-
-_cache_reporoot = {}
-def get_repo_root(target):
-    """Compute the root repos URL given a working-copy path, or a URL."""
-    # Try using "svn info WCDIR". This works only on SVN clients >= 1.3
-    if not is_url(target):
-        try:
-            info = get_svninfo(target)
-            root = info["Repository Root"]
-            _cache_reporoot[root] = None
-            return root
-        except KeyError:
-            pass
-        url = target_to_url(target)
-        assert url[-1] != '/'
-    else:
-        url = target
-
-    # Go through the cache of the repository roots. This avoids extra
-    # server round-trips if we are asking the root of different URLs
-    # in the same repository (the cache in get_svninfo() cannot detect
-    # that of course and would issue a remote command).
-    assert is_url(url)
-    for r in _cache_reporoot:
-        if url.startswith(r):
-            return r
-
-    # Try using "svn info URL". This works only on SVN clients >= 1.2
-    try:
-        info = get_svninfo(url)
-        # info may be {}, in which case we'll see KeyError here
-        root = info["Repository Root"]
-        _cache_reporoot[root] = None
-        return root
-    except (KeyError, LaunchError):
-        pass
-
-    # Constrained to older svn clients, we are stuck with this ugly
-    # trial-and-error implementation. It could be made faster with a
-    # binary search.
-    while url:
-        temp = os.path.dirname(url)
-        try:
-            launchsvn('proplist "%s"' % temp)
-        except LaunchError:
-            _cache_reporoot[url] = None
-            return rstrip(url, "/")
-        url = temp
-
-    error("svn repos root of %s not found" % target)
-
-class SvnLogParser:
-    """
-    Parse the "svn log", going through the XML output and using pulldom (which
-    would even allow streaming the command output).
-    """
-    def __init__(self, xml):
-        self._events = pulldom.parseString(xml)
-    def __getitem__(self, idx):
-        for event, node in self._events:
-            if event == pulldom.START_ELEMENT and node.tagName == "logentry":
-                self._events.expandNode(node)
-                return self.SvnLogRevision(node)
-        raise IndexError, "Could not find 'logentry' tag in xml"
-
-    class SvnLogRevision:
-        def __init__(self, xmlnode):
-            self.n = xmlnode
-        def revision(self):
-            return int(self.n.getAttribute("revision"))
-        def author(self):
-            return self.n.getElementsByTagName("author")[0].firstChild.data
-        def paths(self):
-            return [self.SvnLogPath(n)
-                    for n in  self.n.getElementsByTagName("path")]
-
-        class SvnLogPath:
-            def __init__(self, xmlnode):
-                self.n = xmlnode
-            def action(self):
-                return self.n.getAttribute("action")
-            def pathid(self):
-                return self.n.firstChild.data
-            def copyfrom_rev(self):
-                try: return self.n.getAttribute("copyfrom-rev")
-                except KeyError: return None
-            def copyfrom_pathid(self):
-                try: return self.n.getAttribute("copyfrom-path")
-                except KeyError: return None
-
-def get_copyfrom(target):
-    """Get copyfrom info for a given target (it represents the
-    repository-relative path from where it was branched). NOTE:
-    repos root has no copyfrom info. In this case None is returned.
-
-    Returns the:
-        - source file or directory from which the copy was made
-        - revision from which that source was copied
-        - revision in which the copy was committed
-    """
-    repos_path = PathIdentifier.from_target(target).repo_relative_path
-    for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"'
-                                      % target, split_lines=False)):
-        for p in chg.paths():
-            if p.action() == 'A' and p.pathid() == repos_path:
-                # These values will be None if the corresponding elements are
-                # not found in the log.
-                return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision()
-    return None,None,None
-
-def get_latest_rev(url):
-    """Get the latest revision of the repository of which URL is part."""
-    try:
-        info = get_svninfo(url)
-        if not info.has_key("Revision"):
-            error("Not a valid URL: %s" % url)
-        return info["Revision"]
-    except LaunchError:
-        # Alternative method for latest revision checking (for svn < 1.2)
-        report('checking latest revision of "%s"' % url)
-        L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0]
-        rev = re.search("revision (\d+)", L).group(1)
-        report('latest revision of "%s" is %s' % (url, rev))
-        return rev
-
-def get_created_rev(url):
-    """Lookup the revision at which the path identified by the
-    provided URL was first created."""
-    oldest_rev = -1
-    report('determining oldest revision for URL "%s"' % url)
-    ### TODO: Refactor this to use a modified RevisionLog class.
-    lines = None
-    cmd = "log -r1:HEAD --stop-on-copy -q " + url
-    try:
-        lines = launchsvn(cmd + " --limit=1")
-    except LaunchError:
-        # Assume that --limit isn't supported by the installed 'svn'.
-        lines = launchsvn(cmd)
-    if lines and len(lines) > 1:
-        i = lines[1].find(" ")
-        if i != -1:
-            oldest_rev = int(lines[1][1:i])
-    if oldest_rev == -1:
-        error('unable to determine oldest revision for URL "%s"' % url)
-    return oldest_rev
-
-def get_commit_log(url, revnum):
-    """Return the log message for a specific integer revision
-    number."""
-    out = launchsvn("log --incremental -r%d %s" % (revnum, url))
-    return recode_stdout_to_file("".join(out[1:]))
-
-def construct_merged_log_message(url, revnums):
-    """Return a commit log message containing all the commit messages
-    in the specified revisions at the given URL.  The separator used
-    in this log message is determined by searching for the longest
-    svnmerge separator existing in the commit log messages and
-    extending it by one more separator.  This results in a new commit
-    log message that is clearer in describing merges that contain
-    other merges. Trailing newlines are removed from the embedded
-    log messages."""
-    messages = ['']
-    longest_sep = ''
-    for r in revnums.sorted():
-        message = get_commit_log(url, r)
-        if message:
-            message = re.sub(r'(\r\n|\r|\n)', "\n", message)
-            message = rstrip(message, "\n") + "\n"
-            messages.append(prefix_lines(LOG_LINE_PREFIX, message))
-            for match in LOG_SEPARATOR_RE.findall(message):
-                sep = match[1]
-                if len(sep) > len(longest_sep):
-                    longest_sep = sep
-
-    longest_sep += LOG_SEPARATOR + "\n"
-    messages.append('')
-    return longest_sep.join(messages)
-
-def get_default_source(branch_target, branch_props):
-    """Return the default source for branch_target (given its branch_props).
-    Error out if there is ambiguity."""
-    if not branch_props:
-        error("no integration info available")
-
-    props = branch_props.copy()
-    pathid = PathIdentifier.from_target(branch_target)
-
-    # To make bidirectional merges easier, find the target's
-    # repository local path so it can be removed from the list of
-    # possible integration sources.
-    if props.has_key(pathid):
-        del props[pathid]
-
-    if len(props) > 1:
-        err_msg = "multiple sources found. "
-        err_msg += "Explicit source argument (-S/--source) required.\n"
-        err_msg += "The merge sources available are:"
-        for prop in props:
-          err_msg += "\n  " + str(prop)
-        error(err_msg)
-
-    return props.keys()[0]
-
-def should_find_reflected(branch_dir):
-    should_find_reflected = opts["bidirectional"]
-
-    # If the source has integration info for the target, set find_reflected
-    # even if --bidirectional wasn't specified
-    if not should_find_reflected:
-        source_props = get_merge_props(opts["source-url"])
-        should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir))
-
-    return should_find_reflected
-
-def analyze_revs(target_pathid, url, begin=1, end=None,
-                 find_reflected=False):
-    """For the source of the merges in the source URL being merged into
-    target_pathid, analyze the revisions in the interval begin-end (which
-    defaults to 1-HEAD), to find out which revisions are changes in
-    the url, which are changes elsewhere (so-called 'phantom'
-    revisions), optionally which are reflected changes (to avoid
-    conflicts that can occur when doing bidirectional merging between
-    branches), and which revisions initialize merge tracking against other
-    branches.  Return a tuple of four RevisionSet's:
-        (real_revs, phantom_revs, reflected_revs, initialized_revs).
-
-    NOTE: To maximize speed, if "end" is not provided, the function is
-    not able to find phantom revisions following the last real
-    revision in the URL.
-    """
-
-    begin = str(begin)
-    if end is None:
-        end = "HEAD"
-    else:
-        end = str(end)
-        if long(begin) > long(end):
-            return RevisionSet(""), RevisionSet(""), \
-                   RevisionSet(""), RevisionSet("")
-
-    logs[url] = RevisionLog(url, begin, end, find_reflected)
-    revs = RevisionSet(logs[url].revs)
-
-    if end == "HEAD":
-        # If end is not provided, we do not know which is the latest revision
-        # in the repository. So return the phantom revision set only up to
-        # the latest known revision.
-        end = str(list(revs)[-1])
-
-    phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs
-
-    if find_reflected:
-        reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid)
-        reflected_revs += logs[url].block_metadata().changed_revs(target_pathid)
-    else:
-        reflected_revs = []
-
-    initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs())
-    reflected_revs = RevisionSet(reflected_revs)
-
-    return revs, phantom_revs, reflected_revs, initialized_revs
-
-def analyze_source_revs(branch_target, source_url, **kwargs):
-    """For the given branch and source, extract the real and phantom
-    source revisions."""
-    branch_url = target_to_url(branch_target)
-    branch_pathid = PathIdentifier.from_target(branch_target)
-
-    # Extract the latest repository revision from the URL of the branch
-    # directory (which is already cached at this point).
-    end_rev = get_latest_rev(source_url)
-
-    # Calculate the base of analysis. If there is a "1-XX" interval in the
-    # merged_revs, we do not need to check those.
-    base = 1
-    r = opts["merged-revs"].normalized()
-    if r and r[0][0] == 1:
-        base = r[0][1] + 1
-
-    # See if the user filtered the revision set. If so, we are not
-    # interested in something outside that range.
-    if opts["revision"]:
-        revs = RevisionSet(opts["revision"]).sorted()
-        if base < revs[0]:
-            base = revs[0]
-        if end_rev > revs[-1]:
-            end_rev = revs[-1]
-
-    return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs)
-
-def minimal_merge_intervals(revs, phantom_revs):
-    """Produce the smallest number of intervals suitable for merging. revs
-    is the RevisionSet which we want to merge, and phantom_revs are phantom
-    revisions which can be used to concatenate intervals, thus minimizing the
-    number of operations."""
-    revnums = revs.normalized()
-    ret = []
-
-    cur = revnums.pop()
-    while revnums:
-        next = revnums.pop()
-        assert next[1] < cur[0]      # otherwise it is not ordered
-        assert cur[0] - next[1] > 1  # otherwise it is not normalized
-        for i in range(next[1]+1, cur[0]):
-            if i not in phantom_revs:
-                ret.append(cur)
-                cur = next
-                break
-        else:
-            cur = (next[0], cur[1])
-
-    ret.append(cur)
-    ret.reverse()
-    return ret
-
-def display_revisions(revs, display_style, revisions_msg, source_url):
-    """Show REVS as dictated by DISPLAY_STYLE, either numerically, in
-    log format, or as diffs.  When displaying revisions numerically,
-    prefix output with REVISIONS_MSG when in verbose mode.  Otherwise,
-    request logs or diffs using SOURCE_URL."""
-    if display_style == "revisions":
-        if revs:
-            report(revisions_msg)
-            print revs
-    elif display_style == "logs":
-        for start,end in revs.normalized():
-            svn_command('log --incremental -v -r %d:%d %s' % \
-                        (start, end, source_url))
-    elif display_style in ("diffs", "summarize"):
-        if display_style == 'summarize':
-            summarize = '--summarize '
-        else:
-            summarize = ''
-
-        for start, end in revs.normalized():
-            print
-            if start == end:
-                print "%s: changes in revision %d follow" % (NAME, start)
-            else:
-                print "%s: changes in revisions %d-%d follow" % (NAME,
-                                                                 start, end)
-            print
-
-            # Note: the starting revision number to 'svn diff' is
-            # NOT inclusive so we have to subtract one from ${START}.
-            svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize,
-                                                 source_url))
-    else:
-        assert False, "unhandled display style: %s" % display_style
-
-def action_init(target_dir, target_props):
-    """Initialize for merges."""
-    # Check that directory is ready for being modified
-    check_dir_clean(target_dir)
-
-    target_pathid = PathIdentifier.from_target(target_dir)
-    source_pathid = opts['source-pathid']
-    if source_pathid == target_pathid:
-        error("cannot init integration source path '%s'\nIts path identifier does not "
-              "differ from the path identifier of the current directory, '%s'."
-              % (source_pathid, target_pathid))
-
-    source_url = opts['source-url']
-
-    # If the user hasn't specified the revisions to use, see if the
-    # "source" is a copy from the current tree and if so, we can use
-    # the version data obtained from it.
-    revision_range = opts["revision"]
-    if not revision_range:
-        # If source was originally copied from target, and we are merging
-        # changes from source to target (the copy target is the merge source,
-        # and the copy source is the merge target), then we want to mark as
-        # integrated up to the rev in which the copy was committed which
-        # created the merge source:
-        cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url)
-
-        cf_pathid = None
-        if cf_source:
-            cf_url = get_repo_root(source_url) + cf_source
-            if is_url(cf_url) and check_url(cf_url):
-                cf_pathid = PathIdentifier.from_target(cf_url)
-
-        if target_pathid == cf_pathid:
-            report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' %
-                   (source_url, target_dir, cf_rev, copy_committed_in_rev))
-            revision_range = "1-" + str(copy_committed_in_rev)
-
-    if not revision_range:
-        # If the reverse is true: copy source is the merge source, and
-        # the copy target is the merge target, then we want to mark as
-        # integrated up to the specific rev of the merge target from
-        # which the merge source was copied.  (Longer discussion at:
-        # http://subversion.tigris.org/issues/show_bug.cgi?id=2810  )
-        cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir)
-
-        cf_pathid = None
-        if cf_source:
-            cf_url = get_repo_root(target_dir) + cf_source
-            if is_url(cf_url) and check_url(cf_url):
-                cf_pathid = PathIdentifier.from_target(cf_url)
-
-        source_pathid = PathIdentifier.from_target(source_url)
-        if source_pathid == cf_pathid:
-            report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' %
-                   (target_dir, source_url, cf_rev, copy_committed_in_rev))
-            revision_range = "1-" + cf_rev
-
-    # When neither the merge source nor target is a copy of the other, and
-    # the user did not specify a revision range, then choose a default which is
-    # the current revision; saying, in effect, "everything has been merged, so
-    # mark as integrated up to the latest rev on source url).
-    if not revision_range:
-        revision_range = "1-" + get_latest_rev(source_url)
-
-    revs = RevisionSet(revision_range)
-
-    report('marking "%s" as already containing revisions "%s" of "%s"' %
-           (target_dir, revs, source_url))
-
-    revs = str(revs)
-    # If the local svnmerge-integrated property already has an entry
-    # for the source-pathid, simply error out.
-    if not opts["force"] and target_props.has_key(source_pathid):
-        error('Repository-relative path %s has already been initialized at %s\n'
-              'Use --force to re-initialize' % (source_pathid, target_dir))
-    # set the pathid's external_form based on the user's options
-    source_pathid.external_form = source_pathid.format(opts['location-type'])
-
-    revs = str(revs)
-    target_props[source_pathid] = revs
-
-    # Set property
-    set_merge_props(target_dir, target_props)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \
-            % (NAME, revs)
-        print >>f, '%s' % source_url
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_avail(branch_dir, branch_props):
-    """Show commits available for merges."""
-    source_revs, phantom_revs, reflected_revs, initialized_revs = \
-               analyze_source_revs(branch_dir, opts["source-url"],
-                                   find_reflected=
-                                       should_find_reflected(branch_dir))
-    report('skipping phantom revisions: %s' % phantom_revs)
-    if reflected_revs:
-        report('skipping reflected revisions: %s' % reflected_revs)
-        report('skipping initialized revisions: %s' % initialized_revs)
-
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \
-                 reflected_revs - initialized_revs
-
-    # Compose the set of revisions to show
-    revs = RevisionSet("")
-    report_msg = "revisions available to be merged are:"
-    if "avail" in opts["avail-showwhat"]:
-        revs |= avail_revs
-    if "blocked" in opts["avail-showwhat"]:
-        revs |= blocked_revs
-        report_msg = "revisions blocked are:"
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs = revs & RevisionSet(opts["revision"])
-
-    display_revisions(revs, opts["avail-display"],
-                      report_msg,
-                      opts["source-url"])
-
-def action_integrated(branch_dir, branch_props):
-    """Show change sets already merged.  This set of revisions is
-    calculated from taking svnmerge-integrated property from the
-    branch, and subtracting any revision older than the branch
-    creation revision."""
-    # Extract the integration info for the branch_dir
-    branch_props = get_merge_props(branch_dir)
-    revs = merge_props_to_revision_set(branch_props, opts["source-pathid"])
-
-    # Lookup the oldest revision on the branch path.
-    oldest_src_rev = get_created_rev(opts["source-url"])
-
-    # Subtract any revisions which pre-date the branch.
-    report("subtracting revisions which pre-date the source URL (%d)" %
-           oldest_src_rev)
-    revs = revs - RevisionSet(range(1, oldest_src_rev))
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs = revs & RevisionSet(opts["revision"])
-
-    display_revisions(revs, opts["integrated-display"],
-                      "revisions already integrated are:", opts["source-url"])
-
-def action_merge(branch_dir, branch_props):
-    """Record merge meta data, and do the actual merge (if not
-    requested otherwise via --record-only)."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    source_revs, phantom_revs, reflected_revs, initialized_revs = \
-               analyze_source_revs(branch_dir, opts["source-url"],
-                                   find_reflected=
-                                       should_find_reflected(branch_dir))
-
-    if opts["revision"]:
-        revs = RevisionSet(opts["revision"])
-    else:
-        revs = source_revs
-
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    merged_revs = opts["merged-revs"]
-
-    # Show what we're doing
-    if opts["verbose"]:  # just to avoid useless calculations
-        if merged_revs & revs:
-            report('"%s" already contains revisions %s' % (branch_dir,
-                                                           merged_revs & revs))
-        if phantom_revs:
-            report('memorizing phantom revision(s): %s' % phantom_revs)
-        if reflected_revs:
-            report('memorizing reflected revision(s): %s' % reflected_revs)
-        if blocked_revs & revs:
-            report('skipping blocked revisions(s): %s' % (blocked_revs & revs))
-        if initialized_revs:
-            report('skipping initialized revision(s): %s' % initialized_revs)
-
-    # Compute final merge set.
-    revs = revs - merged_revs - blocked_revs - reflected_revs - \
-           phantom_revs - initialized_revs
-    if not revs:
-        report('no revisions to merge, exiting')
-        return
-
-    # When manually marking revisions as merged, we only update the
-    # integration meta data, and don't perform an actual merge.
-    record_only = opts["record-only"]
-
-    if record_only:
-        report('recording merge of revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-    else:
-        report('merging in revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-
-    # Do the merge(s). Note: the starting revision number to 'svn merge'
-    # is NOT inclusive so we have to subtract one from start.
-    # We try to keep the number of merge operations as low as possible,
-    # because it is faster and reduces the number of conflicts.
-    old_block_props = get_block_props(branch_dir)
-    merge_metadata = logs[opts["source-url"]].merge_metadata()
-    block_metadata = logs[opts["source-url"]].block_metadata()
-    for start,end in minimal_merge_intervals(revs, phantom_revs):
-        if not record_only:
-            # Preset merge/blocked properties to the source value at
-            # the start rev to avoid spurious property conflicts
-            set_merge_props(branch_dir, merge_metadata.get(start - 1))
-            set_block_props(branch_dir, block_metadata.get(start - 1))
-            # Do the merge
-            svn_command("merge --force -r %d:%d %s %s" % \
-                        (start - 1, end, opts["source-url"], branch_dir))
-            # TODO: to support graph merging, add logic to merge the property
-            # meta-data manually
-
-    # Update the set of merged revisions.
-    merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs
-    branch_props[opts["source-pathid"]] = str(merged_revs)
-    set_merge_props(branch_dir, branch_props)
-    # Reset the blocked revs
-    set_block_props(branch_dir, old_block_props)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        if record_only:
-            print >>f, 'Recorded merge of revisions %s via %s from ' % \
-                  (revs, NAME)
-        else:
-            print >>f, 'Merged revisions %s via %s from ' % \
-                  (revs, NAME)
-        print >>f, '%s' % opts["source-url"]
-        if opts["commit-verbose"]:
-            print >>f
-            print >>f, construct_merged_log_message(opts["source-url"], revs),
-
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_block(branch_dir, branch_props):
-    """Block revisions."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    source_revs, phantom_revs, reflected_revs, initialized_revs = \
-               analyze_source_revs(branch_dir, opts["source-url"])
-    revs_to_block = source_revs - opts["merged-revs"]
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs_to_block = RevisionSet(opts["revision"]) & revs_to_block
-
-    if not revs_to_block:
-        error('no available revisions to block')
-
-    # Change blocked information
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    blocked_revs = blocked_revs | revs_to_block
-    set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME)
-        if opts["commit-verbose"]:
-            print >>f
-            print >>f, construct_merged_log_message(opts["source-url"],
-                                                    revs_to_block),
-
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_unblock(branch_dir, branch_props):
-    """Unblock revisions."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    revs_to_unblock = blocked_revs
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"])
-
-    if not revs_to_unblock:
-        error('no available revisions to unblock')
-
-    # Change blocked information
-    blocked_revs = blocked_revs - revs_to_unblock
-    set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME)
-        if opts["commit-verbose"]:
-            print >>f
-            print >>f, construct_merged_log_message(opts["source-url"],
-                                                    revs_to_unblock),
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_rollback(branch_dir, branch_props):
-    """Rollback previously integrated revisions."""
-
-    # Make sure the revision arguments are present
-    if not opts["revision"]:
-        error("The '-r' option is mandatory for rollback")
-
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    # Extract the integration info for the branch_dir
-    branch_props = get_merge_props(branch_dir)
-    # Get the list of all revisions already merged into this source-pathid.
-    merged_revs = merge_props_to_revision_set(branch_props,
-                                              opts["source-pathid"])
-
-    # At which revision was the src created?
-    oldest_src_rev = get_created_rev(opts["source-url"])
-    src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev)
-
-    # Limit to revisions specified by -r (if any)
-    revs = merged_revs & RevisionSet(opts["revision"])
-
-    # make sure there's some revision to rollback
-    if not revs:
-        report("Nothing to rollback in revision range r%s" % opts["revision"])
-        return
-
-    # If even one specified revision lies outside the lifetime of the
-    # merge source, error out.
-    if revs & src_pre_exist_range:
-        err_str  = "Specified revision range falls out of the rollback range.\n"
-        err_str += "%s was created at r%d" % (opts["source-pathid"],
-                                              oldest_src_rev)
-        error(err_str)
-
-    record_only = opts["record-only"]
-
-    if record_only:
-        report('recording rollback of revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-    else:
-        report('rollback of revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-
-    # Do the reverse merge(s). Note: the starting revision number
-    # to 'svn merge' is NOT inclusive so we have to subtract one from start.
-    # We try to keep the number of merge operations as low as possible,
-    # because it is faster and reduces the number of conflicts.
-    rollback_intervals = minimal_merge_intervals(revs, [])
-    # rollback in the reverse order of merge
-    rollback_intervals.reverse()
-    for start, end in rollback_intervals:
-        if not record_only:
-            # Do the merge
-            svn_command("merge --force -r %d:%d %s %s" % \
-                        (end, start - 1, opts["source-url"], branch_dir))
-
-    # Write out commit message if desired
-    # calculate the phantom revs first
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        if record_only:
-            print >>f, 'Recorded rollback of revisions %s via %s from ' % \
-                  (revs , NAME)
-        else:
-            print >>f, 'Rolled back revisions %s via %s from ' % \
-                  (revs , NAME)
-        print >>f, '%s' % opts["source-url"]
-
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-    # Update the set of merged revisions.
-    merged_revs = merged_revs - revs
-    branch_props[opts["source-pathid"]] = str(merged_revs)
-    set_merge_props(branch_dir, branch_props)
-
-def action_uninit(branch_dir, branch_props):
-    """Uninit SOURCE URL."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    # If the source-pathid does not have an entry in the svnmerge-integrated
-    # property, simply error out.
-    if not branch_props.has_key(opts["source-pathid"]):
-        error('Repository-relative path "%s" does not contain merge '
-              'tracking information for "%s"' \
-                % (opts["source-pathid"], branch_dir))
-
-    del branch_props[opts["source-pathid"]]
-
-    # Set merge property with the selected source deleted
-    set_merge_props(branch_dir, branch_props)
-
-    # Set blocked revisions for the selected source to None
-    set_blocked_revs(branch_dir, opts["source-pathid"], None)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Removed merge tracking for "%s" for ' % NAME
-        print >>f, '%s' % opts["source-url"]
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-###############################################################################
-# Command line parsing -- options and commands management
-###############################################################################
-
-class OptBase:
-    def __init__(self, *args, **kwargs):
-        self.help = kwargs["help"]
-        del kwargs["help"]
-        self.lflags = []
-        self.sflags = []
-        for a in args:
-            if a.startswith("--"):   self.lflags.append(a)
-            elif a.startswith("-"):  self.sflags.append(a)
-            else:
-                raise TypeError, "invalid flag name: %s" % a
-        if kwargs.has_key("dest"):
-            self.dest = kwargs["dest"]
-            del kwargs["dest"]
-        else:
-            if not self.lflags:
-                raise TypeError, "cannot deduce dest name without long options"
-            self.dest = self.lflags[0][2:]
-        if kwargs:
-            raise TypeError, "invalid keyword arguments: %r" % kwargs.keys()
-    def repr_flags(self):
-        f = self.sflags + self.lflags
-        r = f[0]
-        for fl in f[1:]:
-            r += " [%s]" % fl
-        return r
-
-class Option(OptBase):
-    def __init__(self, *args, **kwargs):
-        self.default = kwargs.setdefault("default", 0)
-        del kwargs["default"]
-        self.value = kwargs.setdefault("value", None)
-        del kwargs["value"]
-        OptBase.__init__(self, *args, **kwargs)
-    def apply(self, state, value):
-        assert value == ""
-        if self.value is not None:
-            state[self.dest] = self.value
-        else:
-            state[self.dest] += 1
-
-class OptionArg(OptBase):
-    def __init__(self, *args, **kwargs):
-        self.default = kwargs["default"]
-        del kwargs["default"]
-        self.metavar = kwargs.setdefault("metavar", None)
-        del kwargs["metavar"]
-        OptBase.__init__(self, *args, **kwargs)
-
-        if self.metavar is None:
-            if self.dest is not None:
-                self.metavar = self.dest.upper()
-            else:
-                self.metavar = "arg"
-        if self.default:
-            self.help += " (default: %s)" % self.default
-    def apply(self, state, value):
-        assert value is not None
-        state[self.dest] = value
-    def repr_flags(self):
-        r = OptBase.repr_flags(self)
-        return r + " " + self.metavar
-
-class CommandOpts:
-    class Cmd:
-        def __init__(self, *args):
-            self.name, self.func, self.usage, self.help, self.opts = args
-        def short_help(self):
-            return self.help.split(".")[0]
-        def __str__(self):
-            return self.name
-        def __call__(self, *args, **kwargs):
-            return self.func(*args, **kwargs)
-
-    def __init__(self, global_opts, common_opts, command_table, version=None):
-        self.progname = NAME
-        self.version = version.replace("%prog", self.progname)
-        self.cwidth = console_width() - 2
-        self.ctable = command_table.copy()
-        self.gopts = global_opts[:]
-        self.copts = common_opts[:]
-        self._add_builtins()
-        for k in self.ctable.keys():
-            cmd = self.Cmd(k, *self.ctable[k])
-            opts = []
-            for o in cmd.opts:
-                if isinstance(o, types.StringType) or \
-                   isinstance(o, types.UnicodeType):
-                    o = self._find_common(o)
-                opts.append(o)
-            cmd.opts = opts
-            self.ctable[k] = cmd
-
-    def _add_builtins(self):
-        self.gopts.append(
-            Option("-h", "--help", help="show help for this command and exit"))
-        if self.version is not None:
-            self.gopts.append(
-                Option("-V", "--version", help="show version info and exit"))
-        self.ctable["help"] = (self._cmd_help,
-            "help [COMMAND]",
-            "Display help for a specific command. If COMMAND is omitted, "
-            "display brief command description.",
-            [])
-
-    def _cmd_help(self, cmd=None, *args):
-        if args:
-            self.error("wrong number of arguments", "help")
-        if cmd is not None:
-            cmd = self._command(cmd)
-            self.print_command_help(cmd)
-        else:
-            self.print_command_list()
-
-    def _paragraph(self, text, width=78):
-        chunks = re.split("\s+", text.strip())
-        chunks.reverse()
-        lines = []
-        while chunks:
-            L = chunks.pop()
-            while chunks and len(L) + len(chunks[-1]) + 1 <= width:
-                L += " " + chunks.pop()
-            lines.append(L)
-        return lines
-
-    def _paragraphs(self, text, *args, **kwargs):
-        pars = text.split("\n\n")
-        lines = self._paragraph(pars[0], *args, **kwargs)
-        for p in pars[1:]:
-            lines.append("")
-            lines.extend(self._paragraph(p, *args, **kwargs))
-        return lines
-
-    def _print_wrapped(self, text, indent=0):
-        text = self._paragraphs(text, self.cwidth - indent)
-        print text.pop(0)
-        for t in text:
-            print " " * indent + t
-
-    def _find_common(self, fl):
-        for o in self.copts:
-            if fl in o.lflags+o.sflags:
-                return o
-        assert False, fl
-
-    def _compute_flags(self, opts, check_conflicts=True):
-        back = {}
-        sfl = ""
-        lfl = []
-        for o in opts:
-            sapp = lapp = ""
-            if isinstance(o, OptionArg):
-                sapp, lapp = ":", "="
-            for s in o.sflags:
-                if check_conflicts and back.has_key(s):
-                    raise RuntimeError, "option conflict: %s" % s
-                back[s] = o
-                sfl += s[1:] + sapp
-            for l in o.lflags:
-                if check_conflicts and back.has_key(l):
-                    raise RuntimeError, "option conflict: %s" % l
-                back[l] = o
-                lfl.append(l[2:] + lapp)
-        return sfl, lfl, back
-
-    def _extract_command(self, args):
-        """
-        Try to extract the command name from the argument list. This is
-        non-trivial because we want to allow command-specific options even
-        before the command itself.
-        """
-        opts = self.gopts[:]
-        for cmd in self.ctable.values():
-            opts.extend(cmd.opts)
-        sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False)
-
-        lopts,largs = getopt.getopt(args, sfl, lfl)
-        if not largs:
-            return None
-        return self._command(largs[0])
-
-    def _fancy_getopt(self, args, opts, state=None):
-        if state is None:
-            state= {}
-        for o in opts:
-            if not state.has_key(o.dest):
-                state[o.dest] = o.default
-
-        sfl, lfl, back = self._compute_flags(opts)
-        try:
-            lopts,args = getopt.gnu_getopt(args, sfl, lfl)
-        except AttributeError:
-            # Before Python 2.3, there was no gnu_getopt support.
-            # So we can't parse intermixed positional arguments
-            # and options.
-            lopts,args = getopt.getopt(args, sfl, lfl)
-
-        for o,v in lopts:
-            back[o].apply(state, v)
-        return state, args
-
-    def _command(self, cmd):
-        if not self.ctable.has_key(cmd):
-            self.error("unknown command: '%s'" % cmd)
-        return self.ctable[cmd]
-
-    def parse(self, args):
-        if not args:
-            self.print_small_help()
-            sys.exit(0)
-
-        cmd = None
-        try:
-            cmd = self._extract_command(args)
-            opts = self.gopts[:]
-            if cmd:
-                opts.extend(cmd.opts)
-                args.remove(cmd.name)
-            state, args = self._fancy_getopt(args, opts)
-        except getopt.GetoptError, e:
-            self.error(e, cmd)
-
-        # Handle builtins
-        if self.version is not None and state["version"]:
-            self.print_version()
-            sys.exit(0)
-        if state["help"]: # special case for --help
-            if cmd:
-                self.print_command_help(cmd)
-                sys.exit(0)
-            cmd = self.ctable["help"]
-        else:
-            if cmd is None:
-                self.error("command argument required")
-        if str(cmd) == "help":
-            cmd(*args)
-            sys.exit(0)
-        return cmd, args, state
-
-    def error(self, s, cmd=None):
-        print >>sys.stderr, "%s: %s" % (self.progname, s)
-        if cmd is not None:
-            self.print_command_help(cmd)
-        else:
-            self.print_small_help()
-        sys.exit(1)
-    def print_small_help(self):
-        print "Type '%s help' for usage" % self.progname
-    def print_usage_line(self):
-        print "usage: %s <subcommand> [options...] [args...]\n" % self.progname
-    def print_command_list(self):
-        print "Available commands (use '%s help COMMAND' for more details):\n" \
-              % self.progname
-        cmds = self.ctable.keys()
-        cmds.sort()
-        indent = max(map(len, cmds))
-        for c in cmds:
-            h = self.ctable[c].short_help()
-            print "  %-*s   " % (indent, c),
-            self._print_wrapped(h, indent+6)
-    def print_command_help(self, cmd):
-        cmd = self.ctable[str(cmd)]
-        print 'usage: %s %s\n' % (self.progname, cmd.usage)
-        self._print_wrapped(cmd.help)
-        def print_opts(opts, self=self):
-            if not opts: return
-            flags = [o.repr_flags() for o in opts]
-            indent = max(map(len, flags))
-            for f,o in zip(flags, opts):
-                print "  %-*s :" % (indent, f),
-                self._print_wrapped(o.help, indent+5)
-        print '\nCommand options:'
-        print_opts(cmd.opts)
-        print '\nGlobal options:'
-        print_opts(self.gopts)
-
-    def print_version(self):
-        print self.version
-
-###############################################################################
-# Options and Commands description
-###############################################################################
-
-global_opts = [
-    Option("-F", "--force",
-           help="force operation even if the working copy is not clean, or "
-                "there are pending updates"),
-    Option("-n", "--dry-run",
-           help="don't actually change anything, just pretend; "
-                "implies --show-changes"),
-    Option("-s", "--show-changes",
-           help="show subversion commands that make changes"),
-    Option("-v", "--verbose",
-           help="verbose mode: output more information about progress"),
-    OptionArg("-u", "--username",
-              default=None,
-              help="invoke subversion commands with the supplied username"),
-    OptionArg("-p", "--password",
-              default=None,
-              help="invoke subversion commands with the supplied password"),
-    OptionArg("-c", "--config-dir", metavar="DIR",
-              default=None,
-              help="cause subversion commands to consult runtime config directory DIR"),
-]
-
-common_opts = [
-    Option("-b", "--bidirectional",
-           value=True,
-           default=False,
-           help="remove reflected and initialized revisions from merge candidates.  "
-                "Not required but may be specified to speed things up slightly"),
-    OptionArg("-f", "--commit-file", metavar="FILE",
-              default="svnmerge-commit-message.txt",
-              help="set the name of the file where the suggested log message "
-                   "is written to"),
-    Option("-M", "--record-only",
-           value=True,
-           default=False,
-           help="do not perform an actual merge of the changes, yet record "
-                "that a merge happened"),
-    OptionArg("-r", "--revision",
-              metavar="REVLIST",
-              default="",
-              help="specify a revision list, consisting of revision numbers "
-                   'and ranges separated by commas, e.g., "534,537-539,540"'),
-    OptionArg("-S", "--source", "--head",
-              default=None,
-              help="specify a merge source for this branch.  It can be either "
-                   "a working directory path, a full URL, or an unambiguous "
-                   "substring of one of the locations for which merge tracking was "
-                   "already initialized.  Needed only to disambiguate in case of "
-                   "multiple merge sources"),
-]
-
-command_table = {
-    "init": (action_init,
-    "init [OPTION...] [SOURCE]",
-    """Initialize merge tracking from SOURCE on the current working
-    directory.
-
-    If SOURCE is specified, all the revisions in SOURCE are marked as already
-    merged; if this is not correct, you can use --revision to specify the
-    exact list of already-merged revisions.
-
-    If SOURCE is omitted, then it is computed from the "svn cp" history of the
-    current working directory (searching back for the branch point); in this
-    case, %s assumes that no revision has been integrated yet since
-    the branch point (unless you teach it with --revision).""" % NAME,
-    [
-        "-f", "-r", # import common opts
-        OptionArg("-L", "--location-type",
-               dest="location-type",
-               default="path",
-               help="Use this type of location identifier in the new " +
-                    "Subversion properties; 'uuid', 'url', or 'path' " +
-                    "(default)"),
-    ]),
-
-    "avail": (action_avail,
-    "avail [OPTION...] [PATH]",
-    """Show unmerged revisions available for PATH as a revision list.
-    If --revision is given, the revisions shown will be limited to those
-    also specified in the option.
-
-    When svnmerge is used to bidirectionally merge changes between a
-    branch and its source, it is necessary to not merge the same changes
-    forth and back: e.g., if you committed a merge of a certain
-    revision of the branch into the source, you do not want that commit
-    to appear as available to merged into the branch (as the code
-    originated in the branch itself!).  svnmerge will automatically
-    exclude these so-called "reflected" revisions.""",
-    [
-        Option("-A", "--all",
-               dest="avail-showwhat",
-               value=["blocked", "avail"],
-               default=["avail"],
-               help="show both available and blocked revisions (aka ignore "
-                    "blocked revisions)"),
-        "-b",
-        Option("-B", "--blocked",
-               dest="avail-showwhat",
-               value=["blocked"],
-               help="show the blocked revision list (see '%s block')" % NAME),
-        Option("-d", "--diff",
-               dest="avail-display",
-               value="diffs",
-               default="revisions",
-               help="show corresponding diff instead of revision list"),
-        Option("--summarize",
-               dest="avail-display",
-               value="summarize",
-               help="show summarized diff instead of revision list"),
-        Option("-l", "--log",
-               dest="avail-display",
-               value="logs",
-               help="show corresponding log history instead of revision list"),
-        "-r",
-        "-S",
-    ]),
-
-    "integrated": (action_integrated,
-    "integrated [OPTION...] [PATH]",
-    """Show merged revisions available for PATH as a revision list.
-    If --revision is given, the revisions shown will be limited to
-    those also specified in the option.""",
-    [
-        Option("-d", "--diff",
-               dest="integrated-display",
-               value="diffs",
-               default="revisions",
-               help="show corresponding diff instead of revision list"),
-        Option("-l", "--log",
-               dest="integrated-display",
-               value="logs",
-               help="show corresponding log history instead of revision list"),
-        "-r",
-        "-S",
-    ]),
-
-    "rollback": (action_rollback,
-    "rollback [OPTION...] [PATH]",
-    """Rollback previously merged in revisions from PATH.  The
-    --revision option is mandatory, and specifies which revisions
-    will be rolled back.  Only the previously integrated merges
-    will be rolled back.
-
-    When manually rolling back changes, --record-only can be used to
-    instruct %s that a manual rollback of a certain revision
-    already happened, so that it can record it and offer that
-    revision for merge henceforth.""" % (NAME),
-    [
-        "-f", "-r", "-S", "-M", # import common opts
-    ]),
-
-    "merge": (action_merge,
-    "merge [OPTION...] [PATH]",
-    """Merge in revisions into PATH from its source. If --revision is omitted,
-    all the available revisions will be merged. In any case, already merged-in
-    revisions will NOT be merged again.
-
-    When svnmerge is used to bidirectionally merge changes between a
-    branch and its source, it is necessary to not merge the same changes
-    forth and back: e.g., if you committed a merge of a certain
-    revision of the branch into the source, you do not want that commit
-    to appear as available to merged into the branch (as the code
-    originated in the branch itself!).  svnmerge will automatically
-    exclude these so-called "reflected" revisions.
-
-    When manually merging changes across branches, --record-only can
-    be used to instruct %s that a manual merge of a certain revision
-    already happened, so that it can record it and not offer that
-    revision for merge anymore.  Conversely, when there are revisions
-    which should not be merged, use '%s block'.""" % (NAME, NAME),
-    [
-        "-b", "-f", "-r", "-S", "-M", # import common opts
-    ]),
-
-    "block": (action_block,
-    "block [OPTION...] [PATH]",
-    """Block revisions within PATH so that they disappear from the available
-    list. This is useful to hide revisions which will not be integrated.
-    If --revision is omitted, it defaults to all the available revisions.
-
-    Do not use this option to hide revisions that were manually merged
-    into the branch.  Instead, use '%s merge --record-only', which
-    records that a merge happened (as opposed to a merge which should
-    not happen).""" % NAME,
-    [
-        "-f", "-r", "-S", # import common opts
-    ]),
-
-    "unblock": (action_unblock,
-    "unblock [OPTION...] [PATH]",
-    """Revert the effect of '%s block'. If --revision is omitted, all the
-    blocked revisions are unblocked""" % NAME,
-    [
-        "-f", "-r", "-S", # import common opts
-    ]),
-
-    "uninit": (action_uninit,
-    "uninit [OPTION...] [PATH]",
-    """Remove merge tracking information from PATH. It cleans any kind of merge
-    tracking information (including the list of blocked revisions). If there
-    are multiple sources, use --source to indicate which source you want to
-    forget about.""",
-    [
-        "-f", "-S", # import common opts
-    ]),
-}
-
-
-def main(args):
-    global opts
-
-    # Initialize default options
-    opts = default_opts.copy()
-    logs.clear()
-
-    optsparser = CommandOpts(global_opts, common_opts, command_table,
-                             version="%%prog r%s\n  modified: %s\n\n"
-                                     "Copyright (C) 2004,2005 Awarix Inc.\n"
-                                     "Copyright (C) 2005, Giovanni Bajo"
-                                     % (__revision__, __date__))
-
-    cmd, args, state = optsparser.parse(args)
-    opts.update(state)
-
-    source = opts.get("source", None)
-    branch_dir = "."
-
-    if str(cmd) == "init":
-        if len(args) == 1:
-            source = args[0]
-        elif len(args) > 1:
-            optsparser.error("wrong number of parameters", cmd)
-    elif str(cmd) in command_table.keys():
-        if len(args) == 1:
-            branch_dir = args[0]
-        elif len(args) > 1:
-            optsparser.error("wrong number of parameters", cmd)
-    else:
-        assert False, "command not handled: %s" % cmd
-
-    # Validate branch_dir
-    if not is_wc(branch_dir):
-        if str(cmd) == "avail":
-            info = None
-            # it should be noted here that svn info does not error exit
-            # if an invalid target is specified to it (as is
-            # intuitive). so the try, except code is not absolutely
-            # necessary. but, I retain it to indicate the intuitive
-            # handling.
-            try:
-                info = get_svninfo(branch_dir)
-            except LaunchError:
-                pass
-            # test that we definitely targeted a subversion directory,
-            # mirroring the purpose of the earlier is_wc() call
-            if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory":
-                error('"%s" is neither a valid URL, nor a working directory' % branch_dir)
-        else:
-            error('"%s" is not a subversion working directory' % branch_dir)
-
-    # give out some hints as to potential pathids
-    PathIdentifier.hint(branch_dir)
-    if source: PathIdentifier.hint(source)
-
-    # Extract the integration info for the branch_dir
-    branch_props = get_merge_props(branch_dir)
-
-    # Calculate source_url and source_path
-    report("calculate source path for the branch")
-    if not source:
-        if str(cmd) == "init":
-            cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir)
-            if not cf_source:
-                error('no copyfrom info available. '
-                      'Explicit source argument (-S/--source) required.')
-            opts["source-url"] = get_repo_root(branch_dir) + cf_source
-            opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"])
-
-            if not opts["revision"]:
-                opts["revision"] = "1-" + cf_rev
-        else:
-            opts["source-pathid"] = get_default_source(branch_dir, branch_props)
-            opts["source-url"] = opts["source-pathid"].get_url()
-
-        assert is_pathid(opts["source-pathid"])
-        assert is_url(opts["source-url"])
-    else:
-        # The source was given as a command line argument and is stored in
-        # SOURCE.  Ensure that the specified source does not end in a /,
-        # otherwise it's easy to have the same source path listed more
-        # than once in the integrated version properties, with and without
-        # trailing /'s.
-        source = rstrip(source, "/")
-        if not is_wc(source) and not is_url(source):
-            # Check if it is a substring of a pathid recorded
-            # within the branch properties.
-            found = []
-            for pathid in branch_props.keys():
-                if pathid.match_substring(source):
-                    found.append(pathid)
-            if len(found) == 1:
-                # (assumes pathid is a repository-relative-path)
-                source_pathid = found[0]
-                source = source_pathid.get_url()
-            else:
-                error('"%s" is neither a valid URL, nor an unambiguous '
-                      'substring of a repository path, nor a working directory'
-                      % source)
-        else:
-            source_pathid = PathIdentifier.from_target(source)
-
-        source_pathid = PathIdentifier.from_target(source)
-        if str(cmd) == "init" and \
-               source_pathid == PathIdentifier.from_target("."):
-            error("cannot init integration source path '%s'\n"
-                  "Its repository-relative path must differ from the "
-                  "repository-relative path of the current directory."
-                  % source_pathid)
-        opts["source-pathid"] = source_pathid
-        opts["source-url"] = target_to_url(source)
-
-    # Sanity check source_url
-    assert is_url(opts["source-url"])
-    # SVN does not support non-normalized URL (and we should not
-    # have created them)
-    assert opts["source-url"].find("/..") < 0
-
-    report('source is "%s"' % opts["source-url"])
-
-    # Get previously merged revisions (except when command is init)
-    if str(cmd) != "init":
-        opts["merged-revs"] = merge_props_to_revision_set(branch_props,
-                                                          opts["source-pathid"])
-
-    # Perform the action
-    cmd(branch_dir, branch_props)
-
-
-if __name__ == "__main__":
-    try:
-        main(sys.argv[1:])
-    except LaunchError, (ret, cmd, out):
-        err_msg = "command execution failed (exit code: %d)\n" % ret
-        err_msg += cmd + "\n"
-        err_msg += "".join(out)
-        error(err_msg)
-    except KeyboardInterrupt:
-        # Avoid traceback on CTRL+C
-        print "aborted by user"
-        sys.exit(1)
diff --git a/extra/vim/urxvt-mouse.diff b/extra/vim/urxvt-mouse.diff
deleted file mode 100644
index 9112e7ffd..000000000
--- a/extra/vim/urxvt-mouse.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/term.c b/src/term.c
---- a/src/term.c
-+++ b/src/term.c
-@@ -1996,6 +1996,7 @@
- #  define HMT_DEC	4
- #  define HMT_JSBTERM	8
- #  define HMT_PTERM	16
-+#  define HMT_URXVT	32
- static int has_mouse_termcode = 0;
- # endif
- 
-@@ -2031,6 +2032,11 @@
- 	has_mouse_termcode |= HMT_PTERM;
-     else
- #   endif
-+#   ifdef FEAT_MOUSE_URXVT
-+    if (n == KS_URXVT_MOUSE)
-+	has_mouse_termcode |= HMT_URXVT;
-+    else
-+#   endif
- 	has_mouse_termcode |= HMT_NORMAL;
- #  endif
- }
-@@ -2068,6 +2074,11 @@
- 	has_mouse_termcode &= ~HMT_PTERM;
-     else
- #   endif
-+#   ifdef FEAT_MOUSE_URXVT
-+    if (n == KS_URXVT_MOUSE)
-+	has_mouse_termcode &= ~HMT_URXVT;
-+    else
-+#   endif
- 	has_mouse_termcode &= ~HMT_NORMAL;
- #  endif
- }
diff --git a/extra/xfce4-xkb-plugin/crashfix.diff b/extra/xfce4-xkb-plugin/crashfix.diff
deleted file mode 100644
index 5ccfbaa3c..000000000
--- a/extra/xfce4-xkb-plugin/crashfix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit@gmail.com>
-Date: Fri, 24 Sep 2010 21:28:49 +0200
-Subject: Handle cases when the keyboard model is empty
-
-gtk_combo_box_get_active_iter () does not set the iter, and a call to
-gtk_tree_model_get () using this iter will crash. Thus, check the return value
-of gtk_combo_box_get_active_iter () before using the iter.
----
- panel-plugin/xkb-settings-dialog.c |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
-index 178ec5f..37a0a9a 100644
---- a/panel-plugin/xkb-settings-dialog.c
-+++ b/panel-plugin/xkb-settings-dialog.c
-@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb)
-     gint i = 0;
- 
-     model = GTK_TREE_MODEL (xkb->combo_store);
--    gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
--    gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
--    kbd_config->model = kbdmodel;
-+    if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter))
-+    {
-+        gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-+        kbd_config->model = kbdmodel;
-+    }
- 
-     model = GTK_TREE_MODEL (xkb->toggle_options_store);
-     if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))
--- 
-1.7.1
-
diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
deleted file mode 100644
index 5b9dc5401..000000000
--- a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c	2009-03-06 15:16:03.000000000 +0200
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2009-07-20 18:40:34.000000000 +0300
-@@ -150,7 +150,7 @@
-     config->application_map = g_hash_table_new (g_direct_hash, NULL);
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
-     
-     config_item = xkl_config_item_new ();
- 
-@@ -214,7 +214,7 @@
- 
-     gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
- 
--    xkl_engine_stop_listen (config->engine);
-+    xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
- }
- 
- gint
-@@ -547,7 +547,7 @@
-     if (!config) return NULL;
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
- 
-     return registry;
- }
diff --git a/extra/xorg-server/xserver-1.11.2-record-crasher.patch b/extra/xorg-server/xserver-1.11.2-record-crasher.patch
deleted file mode 100644
index 3af207bb9..000000000
--- a/extra/xorg-server/xserver-1.11.2-record-crasher.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From patchwork Tue Nov  8 18:22:13 2011
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: Save major/minor opcodes in ClientRec for RecordAReply
-Date: Tue, 08 Nov 2011 18:22:13 -0000
-From: Keith Packard <keithp@keithp.com>
-X-Patchwork-Id: 7866
-Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com>
-To: xorg-devel@lists.freedesktop.org
-
-The record extension needs the major and minor opcodes in the reply
-hook, but the request buffer may have been freed by the time the hook
-is invoked. Saving the request major and minor codes as the request is
-executed avoids fetching from the defunct request buffer.
-
-This patch also eliminates the public MinorOpcodeOfRequest function,
-making it static to dispatch. Usages of that function have been
-replaced with direct access to the new ClientRec field.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
-
----
-Here's what I was thinking of to fix this -- just record the major and
-minor opcodes of the request in the ClientRec during Dispatch and then
-using those fields in RecordAReply instead of fetching the discarded
-request buffer.
-
-This is entirely untested; I don't know how to make the old code break.
-
- Xext/security.c       |    4 +---
- Xext/xselinux_hooks.c |    4 ++--
- dix/dispatch.c        |   31 ++++++++++++++++++++++---------
- dix/extension.c       |   14 --------------
- include/dixstruct.h   |    1 +
- include/extension.h   |    2 --
- record/record.c       |    8 +++-----
- 7 files changed, 29 insertions(+), 35 deletions(-)
-
-[ fedora: technically this is an ABI breaker since it's changing ClientRec,
-  but hopefully not in a way that matters.  If it does matter, easiest thing
-  to do is have Record add a hook for XaceHookDispatch. - ajax ]
-
-diff --git a/Xext/security.c b/Xext/security.c
-index 08d8158..b0d82ab 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -148,9 +148,7 @@ SecurityLabelInitial(void)
- static _X_INLINE const char *
- SecurityLookupRequestName(ClientPtr client)
- {
--    int major = ((xReq *)client->requestBuffer)->reqType;
--    int minor = MinorOpcodeOfRequest(client);
--    return LookupRequestName(major, minor);
-+    return LookupRequestName(client->majorOp, client->minorOp);
- }
- 
- 
-diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
-index f1d8e5d..0d4c9ab 100644
---- a/Xext/xselinux_hooks.c
-+++ b/Xext/xselinux_hooks.c
-@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata,
-     if (client) {
- 	REQUEST(xReq);
- 	if (stuff) {
--	    major = stuff->reqType;
--	    minor = MinorOpcodeOfRequest(client);
-+	    major = client->majorOp;
-+	    minor = client->minorOp;
- 	}
-     }
-     if (audit->id)
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 6e33615..3600acd 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void)
- 	SmartScheduleLatencyLimited = 0;
- }
- 
--#define MAJOROP ((xReq *)client->requestBuffer)->reqType
-+static inline unsigned short
-+MinorOpcodeOfRequest(ClientPtr client)
-+{
-+    unsigned char major;
-+    ExtensionEntry *ext;
-+
-+    major = ((xReq *)client->requestBuffer)->reqType;
-+    if (major < EXTENSION_BASE)
-+	return 0;
-+    ext = GetExtensionEntry(major);
-+    if (!ext)
-+	return 0;
-+    return ext->MinorOpcode (client);
-+}
- 
- void
- Dispatch(void)
-@@ -419,21 +432,23 @@ Dispatch(void)
- 	        }
- 
- 		client->sequence++;
-+		client->majorOp = ((xReq *)client->requestBuffer)->reqType;
-+		client->minorOp = MinorOpcodeOfRequest(client);
- #ifdef XSERVER_DTRACE
--		XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP,
-+		XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp,
- 			      ((xReq *)client->requestBuffer)->length,
- 			      client->index, client->requestBuffer);
- #endif
- 		if (result > (maxBigRequestSize << 2))
- 		    result = BadLength;
- 		else {
--		    result = XaceHookDispatch(client, MAJOROP);
-+		    result = XaceHookDispatch(client, client->majorOp);
- 		    if (result == Success)
--			result = (* client->requestVector[MAJOROP])(client);
-+			result = (* client->requestVector[client->majorOp])(client);
- 		    XaceHookAuditEnd(client, result);
- 		}
- #ifdef XSERVER_DTRACE
--		XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP,
-+		XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp,
- 			      client->sequence, client->index, result);
- #endif
- 
-@@ -444,8 +459,8 @@ Dispatch(void)
- 		}
- 		else if (result != Success)
- 		{
--		    SendErrorToClient(client, MAJOROP,
--				      MinorOpcodeOfRequest(client),
-+		    SendErrorToClient(client, client->majorOp,
-+				      client->minorOp,
- 				      client->errorValue, result);
- 		    break;
- 		}
-@@ -466,8 +481,6 @@ Dispatch(void)
-     SmartScheduleLatencyLimited = 0;
- }
- 
--#undef MAJOROP
--
- static int  VendorRelease = VENDOR_RELEASE;
- static char *VendorString = VENDOR_NAME;
- 
-diff --git a/dix/extension.c b/dix/extension.c
-index c7bbac5..b677cdb 100644
---- a/dix/extension.c
-+++ b/dix/extension.c
-@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client)
-     return ((xReq *)client->requestBuffer)->data;
- }
- 
--unsigned short
--MinorOpcodeOfRequest(ClientPtr client)
--{
--    unsigned char major;
--
--    major = ((xReq *)client->requestBuffer)->reqType;
--    if (major < EXTENSION_BASE)
--	return 0;
--    major -= EXTENSION_BASE;
--    if (major >= NumExtensions)
--	return 0;
--    return (*extensions[major]->MinorOpcode)(client);
--}
--
- void
- CloseDownExtensions(void)
- {
-diff --git a/include/dixstruct.h b/include/dixstruct.h
-index 6cc9614..0a85f40 100644
---- a/include/dixstruct.h
-+++ b/include/dixstruct.h
-@@ -122,6 +122,7 @@ typedef struct _Client {
-     
-     DeviceIntPtr clientPtr;
-     ClientIdPtr  clientIds;
-+    unsigned short majorOp, minorOp;
- }           ClientRec;
- 
- /*
-diff --git a/include/extension.h b/include/extension.h
-index 29a11c3..9249951 100644
---- a/include/extension.h
-+++ b/include/extension.h
-@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN
- 
- extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
- 
--extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
--
- extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable);
- 
- extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable);
-diff --git a/record/record.c b/record/record.c
-index 68311ac..4a0fe23 100644
---- a/record/record.c
-+++ b/record/record.c
-@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client)
- 	    }
- 	    else /* extension, check minor opcode */
- 	    {
--		int minorop = MinorOpcodeOfRequest(client);
-+		int minorop = client->minorOp;
- 		int numMinOpInfo;
- 		RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo;
- 
-@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
-     RecordContextPtr pContext;
-     RecordClientsAndProtocolPtr pRCAP;
-     int eci;
--    int majorop;
-     ReplyInfoRec *pri = (ReplyInfoRec *)calldata;
-     ClientPtr client = pri->client;
--    REQUEST(xReq);
- 
--    majorop = stuff->reqType;
-     for (eci = 0; eci < numEnabledContexts; eci++)
-     {
- 	pContext = ppAllContexts[eci];
-@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
- 					  NULL);
- 	if (pRCAP)
- 	{
-+	    int majorop = client->majorOp;
- 	    if (pContext->continuedReply)
- 	    {
- 		RecordAProtocolElement(pContext, client, XRecordFromServer,
-@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
- 		}
- 		else /* extension, check minor opcode */
- 		{
--		    int minorop = MinorOpcodeOfRequest(client);
-+		    int minorop = client->minorOp;
- 		    int numMinOpInfo;
- 		    RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo;
- 		    		    assert (pMinorOpInfo);
diff --git a/kde-unstable/kactivities/PKGBUILD b/kde-unstable/kactivities/PKGBUILD
deleted file mode 100644
index c91ba0888..000000000
--- a/kde-unstable/kactivities/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146093 2012-01-05 12:31:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kactivities
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='API for using and interacting with Activities'
-url='http://kde.org/'
-license=('GPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('867c885ad86054b827d5e5f11399a9252d68e7a5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeaccessibility-jovie/PKGBUILD b/kde-unstable/kdeaccessibility-jovie/PKGBUILD
deleted file mode 100644
index 2092c4047..000000000
--- a/kde-unstable/kdeaccessibility-jovie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146103 2012-01-05 12:38:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-jovie
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='A text to speech application'
-url='http://kde.org/applications/utilities/jovie/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-replaces=('kdeaccessibility-kttsd')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/jovie-${pkgver}.tar.bz2")
-sha1sums=('109cfe0b50551a39b46e965e37000b158729b43c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../jovie-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/kde-unstable/kdeaccessibility-jovie/kdeaccessibility-jovie.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeaccessibility-jovie/kdeaccessibility-jovie.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD b/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
deleted file mode 100644
index 5acbcc1fe..000000000
--- a/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146104 2012-01-05 12:38:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kaccessible
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-url='http://accessibility.kde.org/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdelibs' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2")
-sha1sums=('1de6cf98b8ab6b2541339a05dbf19b36ad119857')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kaccessible-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeaccessibility-kmag/PKGBUILD b/kde-unstable/kdeaccessibility-kmag/PKGBUILD
deleted file mode 100644
index 79840cd6d..000000000
--- a/kde-unstable/kdeaccessibility-kmag/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146105 2012-01-05 12:39:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmag
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Screen Magnifier'
-url='http://kde.org/applications/utilities/kmag/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kmag-${pkgver}.tar.bz2")
-sha1sums=('8eac56063c7ed6d81c8078e2a8b93bb81d8de435')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmag-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/kde-unstable/kdeaccessibility-kmag/kdeaccessibility-kmag.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeaccessibility-kmag/kdeaccessibility-kmag.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD b/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
deleted file mode 100644
index f15d0f33e..000000000
--- a/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146106 2012-01-05 12:39:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmousetool
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-url='http://kde.org/applications/utilities/kmousetool/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2")
-sha1sums=('a2daf729557e41b25c353a60d3638622cd295f60')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmousetool-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/kde-unstable/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeaccessibility-kmouth/PKGBUILD b/kde-unstable/kdeaccessibility-kmouth/PKGBUILD
deleted file mode 100644
index cd80dd887..000000000
--- a/kde-unstable/kdeaccessibility-kmouth/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146107 2012-01-05 12:40:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmouth
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Speech Synthesizer Frontend'
-url='http://kde.org/applications/utilities/kmouth/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kmouth-${pkgver}.tar.bz2")
-sha1sums=('9ffbd1f7f88c82ecf01fbe9bac20602b58d6d993')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmouth-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/kde-unstable/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD
deleted file mode 100644
index 122346a81..000000000
--- a/kde-unstable/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 146108 2012-01-05 12:40:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser'
-         'kdeadmin-system-config-printer-kde')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'syslog-path.patch')
-sha1sums=('770195155982d783952856c890aee8bf971ebf61'
-          '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	patch -p1 -i ${srcdir}/syslog-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_strigi-analyzer=OFF \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-	depends=('kdelibs')
-	cd $srcdir/build/kcron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-	pkgdesc='System log viewer tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/ksystemlog/"
-	cd $srcdir/build/ksystemlog
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksystemlog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-	pkgdesc='User Manager'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/system/kuser/"
-	install='kdeadmin.install'
-	cd $srcdir/build/kuser
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kuser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
-	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt'
-             'cups' 'python2-gobject2')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-
-        # Use the python2 executable
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-          "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
-        sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-          "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
-}
diff --git a/kde-unstable/kdeadmin/kdeadmin.install b/kde-unstable/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeadmin/syslog-path.patch b/kde-unstable/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/kde-unstable/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD
deleted file mode 100644
index fb14c2882..000000000
--- a/kde-unstable/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 146110 2012-01-05 12:41:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
-         'kdeartwork-colorschemes'
-         'kdeartwork-desktopthemes'
-         'kdeartwork-emoticons'
-         'kdeartwork-iconthemes'
-         'kdeartwork-kscreensaver'
-         'kdeartwork-sounds'
-         'kdeartwork-styles'
-         'kdeartwork-wallpapers'
-         'kdeartwork-weatherwallpapers')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
-             'libkexiv2')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('ada3eec0be27a35779fefce0ef419ab8eff43ee6')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeartwork-aurorae() {
-	pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
-	cd $srcdir/build/aurorae
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
-	pkgdesc='KDE color schemes'
-    replaces=('kdeaccessibility-colorschemes')
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
-	pkgdesc='KDE desktop themes'
-	cd $srcdir/build/desktopthemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
-	pkgdesc='KDE emoticons'
-	cd $srcdir/build/emoticons
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
-	pkgdesc='KDE icon themes'
-    replaces=('kdeaccessibility-iconthemes')
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
-	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/kscreensaver
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
-	pkgdesc='KDE sounds'
-	cd $srcdir/build/sounds
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
-	pkgdesc='KDE styles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/styles
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwin-styles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
-	pkgdesc='KDE wallpapers'
-	cd $srcdir/build/wallpapers
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/HighResolutionWallpapers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
-	pkgdesc='KDE weather wallpapers'
-	cd $srcdir/build/WeatherWallpapers
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD
deleted file mode 100644
index c93ace4ae..000000000
--- a/kde-unstable/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146112 2012-01-05 12:44:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://kde.org/applications/system/konsole/'
-pkgdesc="Terminal"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('7715655c5a0f0efaab1b015ea12950080a7e7da1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../konsole-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 943d6ab0b..000000000
--- a/kde-unstable/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 146082 2012-01-05 12:24:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'xine-lib')
-optdepends=('htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
-sha1sums=('8384854a3ba5c3edf5bbbd08a3aafb53f2088f0a')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-
-    # Fix Python2 path
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
diff --git a/kde-unstable/kdebase-runtime/kdebase-runtime.install b/kde-unstable/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/kde-unstable/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD
deleted file mode 100644
index 9f04d2a11..000000000
--- a/kde-unstable/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 146593 2012-01-13 22:13:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.97
-pkgrel=2
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# 	not detected by namcap because libgl depends on it
-#	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
-         'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
-optdepends=('kde-wallpapers: officials KDE wallapers')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
-          'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
-           'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('a48197748c59edf0849f0a964f6e0a9a0596538c'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'e4198a443703f749b58a4fec88362fced1b45789'
-          '264e395c2c44cdda5a242c6dee649afab44cd6e5'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
-	cd "${srcdir}"/${_pkgname}-${pkgver}
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-	patch -p0 -i "${srcdir}"/fixpath.patch
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${_pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_Xmms=OFF \
-        -DWITH_Googlegadgets=OFF \
-        -DWITH_libgps=OFF \
-        -DWITH_OpenGLES=ON \
-        -DKWIN_BUILD_WITH_OPENGLES=ON \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
-	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
-	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
-	install -d -m755 "${pkgdir}"/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
-	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
-
-	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
-}
diff --git a/kde-unstable/kdebase-workspace/fixpath.patch b/kde-unstable/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/kde-unstable/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/kde-unstable/kdebase-workspace/kde-np.pam b/kde-unstable/kdebase-workspace/kde-np.pam
deleted file mode 100644
index dfedb8edf..000000000
--- a/kde-unstable/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		required	pam_nologin.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
diff --git a/kde-unstable/kdebase-workspace/kde.pam b/kde-unstable/kdebase-workspace/kde.pam
deleted file mode 100644
index 9ec074d06..000000000
--- a/kde-unstable/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
diff --git a/kde-unstable/kdebase-workspace/kdebase-workspace.install b/kde-unstable/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/kde-unstable/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/kde-unstable/kdebase-workspace/kdm b/kde-unstable/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/kde-unstable/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/kde-unstable/kdebase-workspace/kdm-xinitrd.patch b/kde-unstable/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/kde-unstable/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+"  if [ -x \"$i\" ]; then\n"
-+"    . \"$i\"\n"
-+"  fi\n"
-+"  done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- "  for i in /etc/X11/Xresources/*; do\n"
- "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/kde-unstable/kdebase-workspace/kscreensaver.pam b/kde-unstable/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/kde-unstable/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/kde-unstable/kdebase-workspace/terminate-server.patch b/kde-unstable/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/kde-unstable/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD
deleted file mode 100644
index 3e9ba1b99..000000000
--- a/kde-unstable/kdebase/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 146095 2012-01-05 12:33:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konq-plugins'
-         'kdebase-konqueror'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('5ce9e623724f5ce8f2b6c20ccbdf67e2d2f53d51')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../kde-baseapps-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdebase-dolphin() {
-	pkgdesc='File Manager'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
-                'kdegraphics-thumbnailers: thumbnailers for graphics file'
-                'ruby: servicemenu installation')
-	url="http://kde.org/applications/system/dolphin/"
-        install=kdebase-dolphin.install
-	cd $srcdir/build/dolphin
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dolphin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
-	pkgdesc='Change Password'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	cd $srcdir/build/kdepasswd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdepasswd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
-	pkgdesc='A utility for displaying dialog boxes from shell scripts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kdialog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
-	pkgdesc='Bookmark Organizer and Editor'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
-	pkgdesc='Find Files/Folders'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kfind/"
-	install='kdebase.install'
-	cd $srcdir/build/kfind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konq-plugins() {
-	pkgdesc='Extra plugins for Konqueror'
-	depends=('kdebase-konqueror' 'tidyhtml')
-	replaces=('konq-plugins')
-	install='kdebase.install'
-	cd $srcdir/build/konq-plugins
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
-	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-	optdepends=('kwebkitpart: to enable webkit engine')
-	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase-konqueror.install'
-        conflicts=('kdebase-nsplugins')
-        replaces=('kdebase-nsplugins')
-        for i in konqueror doc/konqueror nsplugins; do
-              cd $srcdir/build/${i}
-              make DESTDIR=$pkgdir install
-        done
-}
-
-package_kdebase-lib() {
-	pkgdesc='KDE libraries for the basic desktop applications'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/lib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
-	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
-	cd $srcdir/build/plasma
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdebase/kdebase-dolphin.install b/kde-unstable/kdebase/kdebase-dolphin.install
deleted file mode 100644
index 660593cf5..000000000
--- a/kde-unstable/kdebase/kdebase-dolphin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdebase/kdebase-konqueror.install b/kde-unstable/kdebase/kdebase-konqueror.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdebase/kdebase-konqueror.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdebase/kdebase.install b/kde-unstable/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 038ed99d9..000000000
--- a/kde-unstable/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146113 2012-01-05 12:45:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.7.97
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qyoto' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('e657f1371ac800419599b609fa5f22ca222ddd83')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kimono-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index f83c1ef3a..000000000
--- a/kde-unstable/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144789 2011-12-08 10:43:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.7.80
-pkgrel=1
-pkgdesc="KDE bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qtruby' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
-sha1sums=('8336a5504f90111772ff4004eff971e779f92327')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../korundum-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 2c19497a6..000000000
--- a/kde-unstable/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 146114 2012-01-05 12:46:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.7.97
-pkgrel=1
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
-source=("http://download.kde.org/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('4c0e2543098acc93acc1c3e692278822d6422077')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kross-interpreters-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_ruby=OFF \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-kross-python() {
-  pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'python2')
-
-  cd "${srcdir}"/build/python
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-java() {
-  pkgdesc="Java language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'java-environment')
-
-  cd "${srcdir}"/build/java
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-ruby() {
-  pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'ruby')
-
-  cd "${srcdir}"/build/ruby
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index 6cf7ac4b9..000000000
--- a/kde-unstable/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146115 2012-01-05 12:46:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
-            'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('509832fd992ca034ab283193329b2d135eec2b87')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlkde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index 8764e1789..000000000
--- a/kde-unstable/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146089 2012-01-05 12:28:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'perl-list-moreutils')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('01210346c5b837bb053e9a96275010090022bf0e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD
deleted file mode 100644
index 390a80569..000000000
--- a/kde-unstable/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146090 2012-01-05 12:29:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-python
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('2d5c94f5e8d369d295a273ae0d2e4f7a13d2a055')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index 4cee428ba..000000000
--- a/kde-unstable/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146092 2012-01-05 12:30:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Qt bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'ruby')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('887bbfd987c5f2c9ddac7ddd355991e73b7f545d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index b8ee1fa44..000000000
--- a/kde-unstable/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146091 2012-01-05 12:29:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.7.97
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'mono')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('aa528ea43b4da946c8585caabe62ad37204562c0')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qyoto-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index 7ac5ae31a..000000000
--- a/kde-unstable/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146084 2012-01-05 12:25:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
-sha1sums=('fa86523655cbf662276fdb7b7fa518ca15d86b3b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokegen-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index 7b904aae6..000000000
--- a/kde-unstable/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146088 2012-01-05 12:27:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('c10d35c40124d0c25e7db548adbe9bacc68721b6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokekde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD
deleted file mode 100644
index 927688ad4..000000000
--- a/kde-unstable/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146085 2012-01-05 12:25:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('2e120e2b88dac2d70b779cc4524af9d2f0a48b1a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokeqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Qwt5=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-analitza/PKGBUILD b/kde-unstable/kdeedu-analitza/PKGBUILD
deleted file mode 100644
index 5e575a980..000000000
--- a/kde-unstable/kdeedu-analitza/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146102 2012-01-05 12:37:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-analitza
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A library to add mathematical features to your program"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/analitza-${pkgver}.tar.bz2")
-sha1sums=('3dea50990405f2e9f714735a223b58567dc3864a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../analitza-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index c359e9c8f..000000000
--- a/kde-unstable/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146116 2012-01-05 12:47:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Memory Enhancement Game"
-url="http://kde.org/applications/education/blinken/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('e11bb7a45db6974eb37518f3d1ac7fea2a92f397')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../blinken-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-blinken/kdeedu-blinken.install b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-blinken/kdeedu-blinken.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index 7cc0a052a..000000000
--- a/kde-unstable/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146117 2012-01-05 12:47:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
-            'octave: Octave backend'
-            'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('4f3e6e741117ecd73723c9fff7aa775ead8e429c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../cantor-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-cantor/kdeedu-cantor.install b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-cantor/kdeedu-cantor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index 319cf785d..000000000
--- a/kde-unstable/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146118 2012-01-05 12:48:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Graph Calculator"
-url="http://kde.org/applications/education/kalgebra/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('12a4e288057a0ac0c8bc2ea95905bcf47258b4f4')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalgebra-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index 7c648158e..000000000
--- a/kde-unstable/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146119 2012-01-05 12:48:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('1bf0f3fdc2428cd13653c70bf3e49596bedfc415')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalzium-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index ba530fc8b..000000000
--- a/kde-unstable/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146121 2012-01-05 12:49:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Letter Order Game"
-url="http://kde.org/applications/education/kanagram/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('b8b07381ec72ae0dbaec72f711eff4e0c58b42f3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kanagram-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index 8b72efd3c..000000000
--- a/kde-unstable/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146122 2012-01-05 12:50:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Exercise Fractions"
-url="http://kde.org/applications/education/kbruch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('e0bed8c63b69d5d6be4125ddb6013d88df0899e6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kbruch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index 7310d1247..000000000
--- a/kde-unstable/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146123 2012-01-05 12:50:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Geography Trainer"
-url="http://kde.org/applications/education/kgeography/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('10ccddf15dc2f7f0e0e0df452a171624cc298c85')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgeography-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index 2db634972..000000000
--- a/kde-unstable/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146124 2012-01-05 12:51:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Hangman Game"
-url="http://kde.org/applications/education/khangman/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('98fca0a79e5f7a1ad3dc09fd17db9f35caca60b5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../khangman-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-khangman/kdeedu-khangman.install b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-khangman/kdeedu-khangman.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD
deleted file mode 100644
index fd01cc17b..000000000
--- a/kde-unstable/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146125 2012-01-05 12:52:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('bf08129550e6a8a14c515a643c5482800a3acfac')
-
-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/kde-unstable/kdeedu-kig/kdeedu-kig.install b/kde-unstable/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/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/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index 9303ab2bc..000000000
--- a/kde-unstable/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146126 2012-01-05 12:53:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Japanese Reference/Study Tool"
-url="http://kde.org/applications/education/kiten/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('7f20baa447672cdb46dc483d72f9690f63b39d6a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kiten-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kiten/kdeedu-kiten.install b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kiten/kdeedu-kiten.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index f625c4d05..000000000
--- a/kde-unstable/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146127 2012-01-05 12:54:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Learn The Alphabet"
-url="http://kde.org/applications/education/klettres/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('668869a40d194dd9dd5918a5d610dcf7e0bdf22f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../klettres-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-klettres/kdeedu-klettres.install b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-klettres/kdeedu-klettres.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index 0d89907ad..000000000
--- a/kde-unstable/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146128 2012-01-05 12:55:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('3bc48b37c661ae2257dea8cdd0e9c37f65c90779')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmplot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index f097e9d61..000000000
--- a/kde-unstable/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146129 2012-01-05 12:56:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('62b417ed92a09fdf8f00859d231a75b2d0331f95')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kstars/kdeedu-kstars.install b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kstars/kdeedu-kstars.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index 81916629c..000000000
--- a/kde-unstable/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146130 2012-01-05 12:57:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('2192b4844f3c2ced96dcc41dcb135b35fa435440')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktouch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index d06ef41d7..000000000
--- a/kde-unstable/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146131 2012-01-05 12:57:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Educational Programming Environment"
-url="http://kde.org/applications/education/kturtle/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('59e6b0f89d1b023d6bd25da3e8d10aae7f46adae')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kturtle-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index ec2114a7b..000000000
--- a/kde-unstable/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146132 2012-01-05 12:58:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Flash Card Trainer"
-url="http://kde.org/applications/education/kwordquiz/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('a5dd2dd5daaaef11827d2984fba9e757865fbfd4')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwordquiz-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD
deleted file mode 100644
index ffedec128..000000000
--- a/kde-unstable/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146097 2012-01-05 12:34:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2")
-sha1sums=('7b91f34d79c13dc3cac47f53249cddfe229251e3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../marble-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-marble/kdeedu-marble.install b/kde-unstable/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-marble/kdeedu-marble.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD
deleted file mode 100644
index 305260545..000000000
--- a/kde-unstable/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146133 2012-01-05 12:58:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Vocabulary Trainer"
-url="http://kde.org/applications/education/parley/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('221805bede547f456ec129f8f35ff7b39b83f6cc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../parley-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-parley/kdeedu-parley.install b/kde-unstable/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-parley/kdeedu-parley.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index 4fcef04a9..000000000
--- a/kde-unstable/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146134 2012-01-05 12:59:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('07708199dc97d6c033450930e96c140df6c19d46')
-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/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD
deleted file mode 100644
index e25d07fdc..000000000
--- a/kde-unstable/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146135 2012-01-05 13:00:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Interactive Physical Simulator"
-url="http://kde.org/applications/education/step/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('0866a4c88090e1e3254e01cfff78455202dae4ab')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../step-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-step/kdeedu-step.install b/kde-unstable/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeedu-step/kdeedu-step.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD
deleted file mode 100644
index 65cfc32b6..000000000
--- a/kde-unstable/kdegames/PKGBUILD
+++ /dev/null
@@ -1,516 +0,0 @@
-# $Id: PKGBUILD 146136 2012-01-05 13:02:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
-         'kdegames-bovo'
-         'kdegames-granatier'
-         'kdegames-kajongg'
-         'kdegames-kapman'
-         'kdegames-katomic'
-         'kdegames-kbattleship'
-         'kdegames-kblackbox'
-         'kdegames-kblocks'
-         'kdegames-kbounce'
-         'kdegames-kbreakout'
-         'kdegames-kdiamond'
-         'kdegames-kfourinline'
-         'kdegames-kgoldrunner'
-         'kdegames-kigo'
-         'kdegames-killbots'
-         'kdegames-kiriki'
-         'kdegames-kjumpingcube'
-         'kdegames-klines'
-         'kdegames-klickety'
-         'kdegames-kmahjongg'
-         'kdegames-kmines'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktron'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python'
-             'openal')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('3be936cc7a7c84b7fbf3b79da59dc65a3a37712b')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdegames-bomber() {
-	pkgdesc='Arcade Bombing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bomber/"
-	install='kdegames.install'
-	cd $srcdir/build/bomber
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bomber
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
-	pkgdesc='Five-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bovo/"
-	install='kdegames.install'
-	cd $srcdir/build/bovo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bovo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
-	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/granatier/"
-	install='kdegames.install'
-	cd $srcdir/build/granatier
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
-        url="http://www.kde.org/applications/games/kajongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kajongg
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
-	pkgdesc='Eat pills escaping ghosts'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kapman/"
-	install='kdegames.install'
-	cd $srcdir/build/kapman
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
-	pkgdesc='Sokoban-like Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/katomic/"
-	install='kdegames.install'
-	cd $srcdir/build/katomic
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
-	pkgdesc='Battleship Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kbattleship/"
-	install='kdegames-kbattleship.install'
-	cd $srcdir/build/kbattleship
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbattleship
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
-		$pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
-	pkgdesc='Blackbox Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblackbox/"
-	install='kdegames.install'
-	cd $srcdir/build/kblackbox
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblackbox
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
-	pkgdesc='Falling Blocks Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblocks/"
-	install='kdegames.install'
-	cd $srcdir/build/kblocks
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblocks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
-	pkgdesc='Ball Bouncing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbounce/"
-	install='kdegames.install'
-	cd $srcdir/build/kbounce
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbounce
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
-	pkgdesc='Breakout-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbreakout/"
-	install='kdegames.install'
-	cd $srcdir/build/kbreakout
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbreakout
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
-	pkgdesc='Three-in-a-row game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kdiamond/"
-	install='kdegames.install'
-	cd $srcdir/build/kdiamond
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdiamond
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
-	pkgdesc='Four-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames-kfourinline.install'
-	cd $srcdir/build/kfourinline
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfourinline
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
-	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/kgoldrunner/"
-	install='kdegames.install'
-	cd $srcdir/build/kgoldrunner
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgoldrunner
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
-	pkgdesc='Go Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
-	url="http://kde.org/applications/games/kigo/"
-	install='kdegames-kigo.install'
-	cd $srcdir/build/kigo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kigo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
-	pkgdesc='Killbots'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/killbots/"
-	install='kdegames.install'
-	cd $srcdir/build/killbots
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/killbots
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
-	pkgdesc='Yahtzee-like Dice Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kiriki/"
-	install='kdegames.install'
-	cd $srcdir/build/kiriki
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiriki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
-	pkgdesc='Territory Capture Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kjumpingcube/"
-	install='kdegames.install'
-	cd $srcdir/build/kjumpingcube
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kjumpingcube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
-	pkgdesc='Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	replaces=('kdegames-ksame')
-	conflicts=('kdegames-ksame')
-	url="http://kde.org/applications/games/ksame/"
-	install='kdegames.install'
-	cd $srcdir/build/klickety
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klickety
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
-	pkgdesc='Tactical Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/klines/"
-	install='kdegames.install'
-	cd $srcdir/build/klines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
-	pkgdesc='Mahjongg Solitaire'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kmahjongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kmahjongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
-	pkgdesc='Minesweeper-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kmines/"
-	install='kdegames.install'
-	cd $srcdir/build/kmines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
-	pkgdesc='Network Construction Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knetwalk/"
-	install='kdegames.install'
-	cd $srcdir/build/knetwalk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/knetwalk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
-	pkgdesc='Miniature Golf'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kolf/"
-	install='kdegames-kolf.install'
-	cd $srcdir/build/kolf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kolf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
-	pkgdesc='A simple ball dodging game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kollision/"
-	install='kdegames.install'
-	cd $srcdir/build/kollision
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kollision
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
-	pkgdesc='Galactic Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/konquest/"
-	install='kdegames.install'
-	cd $srcdir/build/konquest
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/konquest
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
-	pkgdesc='Patience Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames-kpatience.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames-kreversi.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kreversi
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
-		$pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
-	pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kshisen/"
-	install='kdegames.install'
-	cd $srcdir/build/kshisen
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kshisen
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
-	pkgdesc='World Domination Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksirk/"
-	install='kdegames.install'
-	cd $srcdir/build/ksirk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksirk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
-	pkgdesc='Space Arcade Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames-kspaceduel.install'
-	cd $srcdir/build/kspaceduel
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames-ksquares.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksquares
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
-		$pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
-	pkgdesc='KSudoku, Sudoku game & more for KDE'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksudoku/"
-	install='kdegames.install'
-	cd $srcdir/build/ksudoku
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
-	pkgdesc='Tron-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktron/"
-	install='kdegames.install'
-	cd $srcdir/build/ktron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
-	pkgdesc='Picture Game for Children'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames-ktuberling.install'
-	cd $srcdir/build/ktuberling
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktuberling
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
-	pkgdesc='A 3-D game based on Rubik´s Cube'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kubrick/"
-	install='kdegames.install'
-	cd $srcdir/build/kubrick
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-	for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
-		install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
-	done
-}
-
-package_kdegames-libkmahjongg() {
-	pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
-	pkgdesc='Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/lskat/"
-	install='kdegames-lskat.install'
-	cd $srcdir/build/lskat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lskat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
-	pkgdesc='Jigsaw puzzle game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/palapeli/"
-	install='kdegames-palapeli.install'
-	cd $srcdir/build/palapeli
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdegames/kdegames-kbattleship.install b/kde-unstable/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/kde-unstable/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kbattleship.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/kde-unstable/kdegames/kdegames-kfourinline.install b/kde-unstable/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegames/kdegames-kigo.install b/kde-unstable/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegames/kdegames-kolf.install b/kde-unstable/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegames/kdegames-kpatience.install b/kde-unstable/kdegames/kdegames-kpatience.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-kpatience.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/kde-unstable/kdegames/kdegames-kreversi.install b/kde-unstable/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/kde-unstable/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/kde-unstable/kdegames/kdegames-kspaceduel.install b/kde-unstable/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegames/kdegames-ksquares.install b/kde-unstable/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/kde-unstable/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/kde-unstable/kdegames/kdegames-ktuberling.install b/kde-unstable/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegames/kdegames-lskat.install b/kde-unstable/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/kde-unstable/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegames/kdegames-palapeli.install b/kde-unstable/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/kde-unstable/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegames/kdegames.install b/kde-unstable/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index 090a783ab..000000000
--- a/kde-unstable/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146137 2012-01-05 13:04:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A fast and easy to use image viewer for KDE"
-url="http://kde.org/applications/graphics/gwenview/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-lib' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins: extra plugins to share photos')
-install=$pkgname.install
-source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('b7e01c31558963e714954e02f211790a92b35748')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../gwenview-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index 077f082db..000000000
--- a/kde-unstable/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146138 2012-01-05 13:05:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Configure Kamera"
-url="http://kde.org/applications/graphics/kamera/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'gphoto2')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('aba8227c6ea128e9e1205a7a4fb34bb3025da390')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kamera-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index 4e8d22fa1..000000000
--- a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146139 2012-01-05 13:05:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('cba62e106f926a48108fbb956060b38bb0645541')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcolorchooser-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index 7740ca3ec..000000000
--- a/kde-unstable/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146140 2012-01-05 13:06:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A monitor calibration tool"
-url="http://kde.org/applications/graphics/kgamma/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-# note on libxxf86vm:
-#       not detected by namcap because libgl depends on it
-#       but nvidia providing libgl does not depend on libxxf86vm
-depends=('kdebase-runtime' 'libxxf86vm')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('0c96b1ede6e52fae1984958e41e1b66756a1d08e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgamma-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index 153ef6ea5..000000000
--- a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146141 2012-01-05 13:07:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Paint Program"
-url="http://kde.org/applications/graphics/kolourpaint/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('3c6f85d9d5841dcdd63d460000b6810d54a73a9c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kolourpaint-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index 9f708f3d4..000000000
--- a/kde-unstable/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146142 2012-01-05 13:08:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Screen Ruler"
-url="http://kde.org/applications/graphics/kruler/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('a4b35f12f1c76e5c0b43fb752cf067eefae5fabf')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kruler-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index 347f4c565..000000000
--- a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146143 2012-01-05 13:08:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libksane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('6be2fd9d016431dbda3247d9f2d7dc4488816263')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksaneplugin-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index 23063c44e..000000000
--- a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146145 2012-01-05 13:09:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Screen Capture Program"
-url="http://kde.org/applications/graphics/ksnapshot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdelibs' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('ad13735593b73af9367b6bf59582c643aa620732')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksnapshot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-mobipocket/PKGBUILD b/kde-unstable/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index f1c080681..000000000
--- a/kde-unstable/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146146 2012-01-05 13:10:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
-sha1sums=('a5f5e49f030bc9661afe3afdf76955b6b9d48ac2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../mobipocket-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/kde-unstable/kdegraphics-mobipocket/kdegraphics-mobipocket.install
deleted file mode 100644
index 660593cf5..000000000
--- a/kde-unstable/kdegraphics-mobipocket/kdegraphics-mobipocket.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdegraphics-okular/PKGBUILD b/kde-unstable/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 78d38b798..000000000
--- a/kde-unstable/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146086 2012-01-05 12:26:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('202e61f86ba2ed2362d6c112152a8a05527e5f48')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-okular/kdegraphics-okular.install b/kde-unstable/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 41b7952d4..000000000
--- a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146147 2012-01-05 13:11:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1e2dd406ca3bf34df31c6a8fae65a170aa77b849')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index 00c97562b..000000000
--- a/kde-unstable/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146148 2012-01-05 13:12:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A KPart for viewving SVGs"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('21e1d2e50d0afaa1d637d2fc0bf223a2a21c355a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../svgpart-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index 1899b02df..000000000
--- a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146149 2012-01-05 13:13:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkexiv2' 'libkdcraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ebe91aed71b5a89f412ffb90075d3430c8757f2b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD
deleted file mode 100644
index 8e79542c1..000000000
--- a/kde-unstable/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 146158 2012-01-05 13:35:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
-        'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch')
-sha1sums=('aded65a18f5320d988d9da6da15cd16af9c1aa43'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       # https://bugs.kde.org/show_bug.cgi?id=285028
-       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/kde-unstable/kdelibs/archlinux-menu.patch b/kde-unstable/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/kde-unstable/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/kde-unstable/kdelibs/fix-knotify-filepath.patch b/kde-unstable/kdelibs/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/kde-unstable/kdelibs/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/kde-unstable/kdelibs/kde-applications-menu.patch b/kde-unstable/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/kde-unstable/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/kde-unstable/kdelibs/kdelibs.install b/kde-unstable/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/kde-unstable/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD
deleted file mode 100644
index 66afba77b..000000000
--- a/kde-unstable/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: PKGBUILD 146150 2012-01-05 13:14:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
-             'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
-sha1sums=('12502197959f01aeedb1abda9ee56f9a312cd5a4'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia-dragonplayer.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dragonplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-	depends=('kdebase-runtime' 'tunepimp')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/juk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmix
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcontrol/cddbretrieval
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch b/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch
deleted file mode 100644
index 8ff32e866..000000000
--- a/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Index: kmix/gui/mdwslider.h
-===================================================================
---- kmix/gui/mdwslider.h	(revision 1270927)
-+++ kmix/gui/mdwslider.h	(revision 1270928)
-@@ -56,7 +56,7 @@
- 	       bool includePlayback, bool includeCapture,
- 	       bool small, Qt::Orientation,
- 	       QWidget* parent, ViewBase* view, ProfControl *pctl);
--    ~MDWSlider() { }
-+    virtual ~MDWSlider();
- 
-     enum LabelType { LT_ALL, LT_FIRST_CAPTURE, LT_NONE };
-     void addActionToPopup( KAction *action );
-Index: kmix/gui/viewbase.cpp
-===================================================================
---- kmix/gui/viewbase.cpp	(revision 1270927)
-+++ kmix/gui/viewbase.cpp	(revision 1270928)
-@@ -128,13 +128,14 @@
-     // allow view to "polish" itself
-     constructionFinished();
- 
--   kDebug() << "CONNECT ViewBase count " << _mixers.size();
--  foreach ( Mixer* mixer, _mixers )
--  {
--    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id(); 
--   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
--   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
--  }
-+// Moved the following up one Level to KMixerWidget
-+//   kDebug() << "CONNECT ViewBase count " << _mixers.size();
-+//  foreach ( Mixer* mixer, _mixers )
-+//  {
-+//    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
-+//   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
-+//   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
-+//  }
- 
-     
- }
-@@ -217,10 +218,6 @@
- 		setMixSet();
- 		kDebug(67100) << "ViewBase::controlsReconfigured() " << mixer_ID << ": Recreating widgets (mixset contains: " << _mixSet->count() << ")";
- 		createDeviceWidgets();
--
--		// We've done the low level stuff our selves but let elements
--		// above know what has happened so they can reload config etc.
--		emit redrawMixer(mixer_ID);
- 	}
- }
- 
-Index: kmix/gui/kmixerwidget.h
-===================================================================
---- kmix/gui/kmixerwidget.h	(revision 1270927)
-+++ kmix/gui/kmixerwidget.h	(revision 1270928)
-@@ -75,6 +75,10 @@
-    void saveConfig( KConfig *config );
-    void loadConfig( KConfig *config );
- 
-+  private slots:
-+    void controlsReconfiguredToplevel(QString mixerId);
-+    void refreshVolumeLevelsToplevel();
-+
-   private:
-    Mixer *_mixer;
-    QVBoxLayout *m_topLayout; // contains TabWidget
-@@ -82,6 +86,7 @@
-    ProfTab* _tab;
-    std::vector<ViewBase*> _views;
-    KActionCollection* _actionCollection;  // -<- applciations wide action collection
-+   QWidget* _mainWindow;
- 
-    
-    void createLayout(ViewBase::ViewFlags vflags);
-Index: kmix/gui/mixdevicewidget.h
-===================================================================
---- kmix/gui/mixdevicewidget.h	(revision 1270927)
-+++ kmix/gui/mixdevicewidget.h	(revision 1270928)
-@@ -47,7 +47,7 @@
-     MixDeviceWidget( MixDevice* md,
-                      bool small, Qt::Orientation orientation,
-                      QWidget* parent, ViewBase*, ProfControl * );
--    ~MixDeviceWidget();
-+    virtual ~MixDeviceWidget();
- 
-     void addActionToPopup( KAction *action );
- 
-Index: kmix/gui/mdwslider.cpp
-===================================================================
---- kmix/gui/mdwslider.cpp	(revision 1270927)
-+++ kmix/gui/mdwslider.cpp	(revision 1270928)
-@@ -81,6 +81,17 @@
-     update();
- }
- 
-+MDWSlider::~MDWSlider()
-+{
-+	foreach( QAbstractSlider* slider, m_slidersPlayback)
-+	{
-+		delete slider;
-+	}
-+	foreach( QAbstractSlider* slider, m_slidersCapture)
-+	{
-+		delete slider;
-+	}
-+}
- 
- void MDWSlider::createActions()
- {
-Index: kmix/gui/kmixerwidget.cpp
-===================================================================
---- kmix/gui/kmixerwidget.cpp	(revision 1270927)
-+++ kmix/gui/kmixerwidget.cpp	(revision 1270928)
-@@ -37,6 +37,7 @@
- #include <ktabwidget.h>
- 
- // KMix
-+#include "apps/kmix.h"
- #include "gui/guiprofile.h"
- #include "gui/kmixerwidget.h"
- #include "gui/kmixtoolbox.h"
-@@ -58,6 +59,8 @@
-      m_topLayout(0), _guiprof(guiprof),
-      _actionCollection(actionCollection)
- {
-+	_mainWindow = parent;
-+	//kDebug() << "kmixWindow created: parent=" << parent << ", parentWidget()=" << parentWidget();
-    if ( _mixer )
-    {
-       createLayout(vflags);
-@@ -169,13 +172,42 @@
-       connect( vbase, SIGNAL(toggleMenuBar()), parentWidget(), SLOT(toggleMenuBar()) );
-       // *this will be deleted on rebuildGUI(), so lets queue the signal
-       connect( vbase, SIGNAL(rebuildGUI())   , parentWidget(), SLOT(recreateGUIwithSavingView()), Qt::QueuedConnection );
--      connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
-+      //connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
-+
-+      kDebug() << "CONNECT ViewBase count " << vbase->getMixers().size();
-+	  foreach ( Mixer* mixer, vbase->getMixers() )
-+	  {
-+	    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
-+	   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevelsToplevel()) );
-+	   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfiguredToplevel(QString)) );
-+	  }
-       return true;
-    }
- }
- 
-+void KMixerWidget::controlsReconfiguredToplevel(QString mixerId)
-+{
-+	foreach ( ViewBase* vbase, _views)
-+	{
-+		vbase->controlsReconfigured(mixerId);
-+	}
-+	KMixWindow* kmixWindow = qobject_cast<KMixWindow*>(_mainWindow);
-+	kDebug() << "kmixWindow to redraw: " << kmixWindow << ", not-casted=" << _mainWindow;
-+	if (kmixWindow != 0)
-+	{
-+		kmixWindow->redrawMixer(mixerId);
-+	}
-+}
- 
-+void KMixerWidget::refreshVolumeLevelsToplevel()
-+{
-+	foreach ( ViewBase* vbase, _views)
-+	{
-+		vbase->refreshVolumeLevels();
-+	}
-+}
- 
-+
- /**
-  * Returns the current View. Normally we have only one View, so we always return the first view.
-  * This method is only here for one reason: We can plug in an action in the main menu, so that
-Index: kmix/gui/viewbase.h
-===================================================================
---- kmix/gui/viewbase.h	(revision 1270927)
-+++ kmix/gui/viewbase.h	(revision 1270928)
-@@ -114,6 +114,8 @@
-    GUIProfile* guiProfile() { return _guiprof; };
-    KActionCollection* actionCollection() { return _actions; };
- 
-+   QSet<Mixer*>& getMixers() { return _mixers; };
-+
-     /**
-      * Contains the widgets for the _mixSet. There is a 1:1 relationship, which means:
-      * _mdws[i] is the Widget for the MixDevice _mixSet[i] - please see ViewBase::createDeviceWidgets().
-@@ -124,7 +126,7 @@
- 
- signals:
-     void rebuildGUI();
--    void redrawMixer( const QString& mixer_ID );
-+    //void redrawMixer( const QString& mixer_ID );
- 
- 
- protected:
diff --git a/kde-unstable/kdemultimedia/kdemultimedia-dragonplayer.install b/kde-unstable/kdemultimedia/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdemultimedia/kdemultimedia-dragonplayer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdemultimedia/kdemultimedia.install b/kde-unstable/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdemultimedia/mplayerthumbs.config b/kde-unstable/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/kde-unstable/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD
deleted file mode 100644
index cfb079e10..000000000
--- a/kde-unstable/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id: PKGBUILD 146151 2012-01-05 13:15:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
-         'kdenetwork-kdnssd'
-         'kdenetwork-kget'
-         'kdenetwork-kopete'
-         'kdenetwork-kppp'
-         'kdenetwork-krdc'
-         'kdenetwork-krfb')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('81f146577669e1c26d875045ede6144437392526')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-        -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF
-	make
-}
-
-package_kdenetwork-filesharing() {
-	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
-	depends=('kdelibs' 'smbclient')
-	install='kdenetwork.install'
-	cd $srcdir/build/filesharing
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
-	pkgdesc='Monitors the network for DNS-SD services'
-	depends=('kdelibs')
-	cd $srcdir/build/kdnssd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
-	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork-kget.install'
-	cd $srcdir/build/kget
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kget
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kopete() {
-	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
-	pkgdesc='Internet Dial-Up Tool'
-	depends=('kdebase-runtime' 'ppp')
-	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork-kppp.install'
-	cd $srcdir/build/kppp
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kppp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
-	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
-    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krdc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# note on libxdamage:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdenetwork/kdenetwork-kget.install b/kde-unstable/kdenetwork/kdenetwork-kget.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdenetwork/kdenetwork-kget.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdenetwork/kdenetwork-kopete.install b/kde-unstable/kdenetwork/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdenetwork/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdenetwork/kdenetwork-kppp.install b/kde-unstable/kdenetwork/kdenetwork-kppp.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdenetwork/kdenetwork-kppp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdenetwork/kdenetwork.install b/kde-unstable/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD
deleted file mode 100644
index e4166a47b..000000000
--- a/kde-unstable/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146083 2012-01-05 12:24:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('38e1f94e6e460647572bb360f825d9555bd87342')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdepim-runtime/kdepim-runtime.install b/kde-unstable/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/kde-unstable/kdepim-runtime/kdepim-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD
deleted file mode 100644
index 75892b062..000000000
--- a/kde-unstable/kdepim/PKGBUILD
+++ /dev/null
@@ -1,244 +0,0 @@
-# $Id: PKGBUILD 146152 2012-01-05 13:17:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
-         'kdepim-akregator'
-         'kdepim-blogilo'
-         'kdepim-console'
-         'kdepim-kaddressbook'
-         'kdepim-kalarm'
-         'kdepim-kjots'
-         'kdepim-kleopatra'
-         'kdepim-kmail'
-         'kdepim-knode'
-         'kdepim-knotes'
-         'kdepim-kontact'
-         'kdepim-korganizer'
-         'kdepim-kresources'
-         'kdepim-ktimetracker'
-         'kdepim-libkdepim')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
-             'kde-agent')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('03976423c5154052f32e1333ef73f6d03bcb4ef9')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDEPIM_BUILD_MOBILE=OFF
-	make
-}
-
-package_kdepim-akonadiconsole() {
-	pkgdesc='Akonadi Management and Debugging Console'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/akonadiconsole
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
-	pkgdesc='A Feed Reader for KDE'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/akregator/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/akregator
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
-	pkgdesc='A KDE Blogging Client'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/internet/blogilo/"
-	replaces=('blogilo')
-	conflicts=('blogilo')
-	install='kdepim.install'
-	cd "${srcdir}"/build/blogilo
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/blogilo
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
-	pkgdesc='Command line tool for accessing calendar files'
-	depends=('kdepim-runtime')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/console
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
-	pkgdesc='Contact Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kaddressbook/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
-	pkgdesc='Personal Alarm Scheduler'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kalarm/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kalarm
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kalarm
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
-	pkgdesc='Note Taker'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kjots/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kjots
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI'
-	depends=('kdepim-libkdepim')
-    install=kdepim-kleopatra.install
-	url="http://kde.org/applications/utilities/kleopatra/"
-	cd "${srcdir}"/build/kleopatra
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kleopatra
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
-	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
-	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	           'kdepim-mimelib' 'kdepim-plugins')
-	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		mailfilteragent ontologies kontact/plugins/kmail; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-knode() {
-	pkgdesc='News Reader'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/knode/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knode
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
-	pkgdesc='Popup Notes'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/knotes/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knotes
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
-	pkgdesc='Personal Information Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kontact/"
-	install='kdepim.install'
-	conflcits=('kdepim-kontactinterfaces')
-	replaces=('kdepim-kontactinterfaces')
-	for i in kontact/src doc/kontact \
-		kontact/plugins/summary kontact/plugins/specialdates; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-korganizer() {
-	pkgdesc='Calendar and Scheduling Program'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/korganizer"
-	install='kdepim-korganizer.install'
-	cd "${srcdir}"/build/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/korganizer
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kresources() {
-	pkgdesc='KDE PIM resources'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/kresources
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
-	pkgdesc='Personal Time Tracker'
-	depends=('kdepim-kresources')
-	url="http://kde.org/applications/utilities/ktimetracker/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/ktimetracker
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
-	pkgdesc='Library for KDE PIM'
-	groups=()
-	depends=('kde-agent' 'kdepim-runtime')
-	url='http://pim.kde.org'
-	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		messagecomposer messagecore messagelist messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-        plugins/ktexteditor; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
diff --git a/kde-unstable/kdepim/kdepim-kleopatra.install b/kde-unstable/kdepim/kdepim-kleopatra.install
deleted file mode 100644
index 5787df72f..000000000
--- a/kde-unstable/kdepim/kdepim-kleopatra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdepim/kdepim-kmail.install b/kde-unstable/kdepim/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/kde-unstable/kdepim/kdepim-kmail.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdepim/kdepim-korganizer.install b/kde-unstable/kdepim/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/kde-unstable/kdepim/kdepim-korganizer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdepim/kdepim.install b/kde-unstable/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdepim/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD
deleted file mode 100644
index 079a9d3ab..000000000
--- a/kde-unstable/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146080 2012-01-05 12:20:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-install='kdepimlibs.install'
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('034ca6486dcef06cfa9ef4f8059b897be9069ebe')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdepimlibs/kdepimlibs.install b/kde-unstable/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/kde-unstable/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index cf2d00b9d..000000000
--- a/kde-unstable/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,619 +0,0 @@
-# $Id: PKGBUILD 146153 2012-01-05 13:18:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
-         'kdeplasma-addons-applets-binary-clock'
-         'kdeplasma-addons-applets-blackboard'
-         'kdeplasma-addons-applets-bookmarks'
-         'kdeplasma-addons-applets-bubblemon'
-         'kdeplasma-addons-applets-calculator'
-         'kdeplasma-addons-applets-charselect'
-         'kdeplasma-addons-applets-comic'
-         'kdeplasma-addons-applets-community'
-         'kdeplasma-addons-applets-dict'
-         'kdeplasma-addons-applets-eyes'
-         'kdeplasma-addons-applets-fifteenpuzzle'
-         'kdeplasma-addons-applets-filewatcher'
-         'kdeplasma-addons-applets-frame'
-         'kdeplasma-addons-applets-fuzzy-clock'
-         'kdeplasma-addons-applets-icontasks'
-         'kdeplasma-addons-applets-incomingmsg'
-         'kdeplasma-addons-applets-kdeobservatory'
-         'kdeplasma-addons-applets-kimpanel'
-         'kdeplasma-addons-applets-knowledgebase'
-         'kdeplasma-addons-applets-kolourpicker'
-         'kdeplasma-addons-applets-konqprofiles'
-         'kdeplasma-addons-applets-konsoleprofiles'
-         'kdeplasma-addons-applets-lancelot'
-         'kdeplasma-addons-applets-leavenote'
-         'kdeplasma-addons-applets-life'
-         'kdeplasma-addons-applets-luna'
-         'kdeplasma-addons-applets-magnifique'
-         'kdeplasma-addons-applets-mediaplayer'
-         'kdeplasma-addons-applets-microblog'
-         'kdeplasma-addons-applets-news'
-         'kdeplasma-addons-applets-notes'
-         'kdeplasma-addons-applets-nowplaying'
-         'kdeplasma-addons-applets-paste'
-         'kdeplasma-addons-applets-pastebin'
-         'kdeplasma-addons-applets-plasmaboard'
-         'kdeplasma-addons-applets-previewer'
-         'kdeplasma-addons-applets-qalculate'
-         'kdeplasma-addons-applets-rememberthemilk'
-         'kdeplasma-addons-applets-rssnow'
-         'kdeplasma-addons-applets-showdashboard'
-         'kdeplasma-addons-applets-showdesktop'
-         'kdeplasma-addons-applets-social-news'
-         'kdeplasma-addons-applets-spellcheck'
-         'kdeplasma-addons-applets-systemloadviewer'
-         'kdeplasma-addons-applets-timer'
-         'kdeplasma-addons-applets-unitconverter'
-         'kdeplasma-addons-applets-weather'
-         'kdeplasma-addons-applets-weatherstation'
-         'kdeplasma-addons-applets-webslice'
-         'kdeplasma-addons-containments'
-         'kdeplasma-addons-libs'
-         'kdeplasma-addons-runners-audioplayercontrol'
-         'kdeplasma-addons-runners-browserhistory'
-         'kdeplasma-addons-runners-characters'
-         'kdeplasma-addons-runners-contacts'
-         'kdeplasma-addons-runners-converter'
-         'kdeplasma-addons-runners-datetime'
-         'kdeplasma-addons-runners-events'
-         'kdeplasma-addons-runners-katesessions'
-         'kdeplasma-addons-runners-konquerorsessions'
-         'kdeplasma-addons-runners-konsolesessions'
-         'kdeplasma-addons-runners-kopete'
-         'kdeplasma-addons-runners-mediawiki'
-         'kdeplasma-addons-runners-spellchecker'
-         'kdeplasma-addons-wallpapers-mandelbrot'
-         'kdeplasma-addons-wallpapers-marble'
-         'kdeplasma-addons-wallpapers-pattern'
-         'kdeplasma-addons-wallpapers-potd'
-         'kdeplasma-addons-wallpapers-virus'
-         'kdeplasma-addons-wallpapers-weather')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
-             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('00a755c401f0594fdcd0fdbd3773ab5c3ec04fbf')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeplasma-addons-applets-bball() {
-	pkgdesc='A bouncy ball for plasma'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/bball
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
-	pkgdesc='Time displayed in binary format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/binary-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
-	pkgdesc='Black Board'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/blackboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
-	pkgdesc='Quick Access to the Bookmarks'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
-	pkgdesc='A pretty bubble that monitors your system.'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bubblemon
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
-	pkgdesc='Calculate simple sums'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/calculator
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
-	pkgdesc='View, select, and copy characters from a font collection'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/charselect
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
-	pkgdesc='View comic strips from the Internet'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/comic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
-	pkgdesc='Communicate using the Social Desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/community
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
-	pkgdesc='Look up the meaning of words and their translation into different languages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/dict
-	make DESTDIR=$pkgdir install
-	# FIXME
-	# /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
-	rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
-	pkgdesc='XEyes clone'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/eyes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
-	pkgdesc='Put the pieces in order'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/fifteenPuzzle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
-	pkgdesc='Watch for changes in specified files'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fileWatcher
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
-	pkgdesc='Display your favorite pictures'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/applets/frame
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
-	pkgdesc='Time displayed in a less precise format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fuzzy-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-icontasks() {
-        pkgdesc='Switch between running applications'
-        depends=('kdebase-workspace')
-        cd $srcdir/build/applets/icontasks
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
-	pkgdesc='Notification of new messages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/incomingmsg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
-	pkgdesc='Visualize the KDE ecosystem'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/kdeobservatory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
-	pkgdesc='A generic input method panel for Oriental languages'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	optdepends=('scim: SCIM backend'
-		        'fcitx: FCITX backend'
-                'ibus: IBUS backend')
-	cd $srcdir/build/applets/kimpanel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
-	pkgdesc='Opendesktop Knowledgebase'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/knowledgebase
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
-	pkgdesc='Pick a color from the desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/kolourpicker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
-	pkgdesc='List and launch Konqueror profiles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/konsoleprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
-	pkgdesc='Launcher to start applications'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	replaces=('lancelot')
-	provides=('lancelot')
-	conflicts=('lancelot')
-	install='kdeplasma-addons-applets-lancelot.install'
-	cd $srcdir/build/applets/lancelot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
-	pkgdesc='Leave notes for users while they are away'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/leavenote
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
-	pkgdesc='Life'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/life
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
-	pkgdesc='Display moon phases for your location'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/luna
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
-	pkgdesc='A magnification glass for the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/magnifique
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
-	pkgdesc='Widget that can play video and sound'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/mediaplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
-	pkgdesc='Update and view your microblog status.'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl')
-	cd $srcdir/build/applets/microblog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
-	pkgdesc='Desktop sticky notes'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/notes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
-	pkgdesc='Displays currently playing audio'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/nowplaying
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
-	pkgdesc='Paste text snippets'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/paste
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
-	pkgdesc='Paste text/images to a remote server'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/pastebin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
-	pkgdesc='A virtual, on-screen keyboard'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/plasmaboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
-	pkgdesc='Preview This File'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/previewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
-	pkgdesc='A powerful mathematical equation solver'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/rememberthemilk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/rssnow
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
-	pkgdesc='Show the Plasma widget dashboard above other windows'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdashboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
-	pkgdesc='Show the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdesktop
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-social-news() {
-	pkgdesc='Stay informed with the Social Desktop'
-	replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/social-news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
-	pkgdesc='Fast spell checking'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/spellcheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
-	pkgdesc='Tiny CPU/RAM/Swap monitor'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/systemloadviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
-	pkgdesc='Countdown over a specified time period'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/timer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
-	pkgdesc='Plasmoid for converting units'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/unitconverter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
-	pkgdesc='Displays Weather information'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weather
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
-	pkgdesc='Weather reports with an LCD display style'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weatherstation
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
-	pkgdesc='Show a part of a webpage'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/webslice
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
-	pkgdesc='Activities types for Plasma shells'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/containments
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
-	pkgdesc='Plasma Addon Library'
-	depends=('kdebase-workspace')
-	groups=()
-	replaces=('kdeplasma-addons-dataengines')
-	provides=('kdeplasma-addons-dataengines')
-	conflicts=('kdeplasma-addons-dataengines')
-	cd $srcdir/build/libs
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dataengines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
-	pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/audioplayercontrol
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
-	pkgdesc='Searches in Konqueror´s history'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/browserhistory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
-	pkgdesc='special Characters'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/characters
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
-	pkgdesc='Finds entries in your address book'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/contacts
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
-	pkgdesc='Convert values to different units'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/converter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
-	pkgdesc='The current date and time, locally or in any timezone'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/datetime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
-	pkgdesc='Calendar Events runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/events
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
-	pkgdesc='Matches Kate Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
-	pkgdesc='Search on Wikitravel'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/mediawiki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
-	pkgdesc='Check the spelling of a word'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/spellchecker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
-	pkgdesc='Mandelbrot'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/mandelbrot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
-	pkgdesc='Globe'
-	depends=('kdebase-workspace' 'kdeedu-marble')
-	cd $srcdir/build/wallpapers/marble
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
-	pkgdesc='Pattern'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/pattern
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-potd() {
-        pkgdesc='Picture of the Day'
-        depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-        cd $srcdir/build/wallpapers/potd
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
-	pkgdesc='Virus'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/virus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
-	pkgdesc='Weather'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/wallpapers/weather
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 4ec248591..000000000
--- a/kde-unstable/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 146087 2012-01-05 12:27:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('42167ab1e037e7ceaea15a1b7782c98a24730ce8'
-          '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
-
-build() {
-  cd "${srcdir}"/kate-${pkgver}
-  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kate-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_KTEXTEDITOR=OFF
-  make
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime')
-  groups=('kde' 'kdebase')
-  url="http://www.kde.org/applications/utilities/kwrite/"
-  install='kdebase-kwrite.install'
-
-  cd "${srcdir}"/build/kwrite
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-kwrite')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-
-  cd "${srcdir}"/build/kate
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdesdk-kate/kdebase-kwrite.install b/kde-unstable/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdesdk-kate/kdebase-kwrite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdesdk-kate/kdesdk-kate.install b/kde-unstable/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 0446d161b..000000000
--- a/kde-unstable/kdesdk-kate/kdesdk-kate.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 27729d1ad..000000000
--- a/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.7.80/part/syntax/data/bash.xml~	2011-11-20 06:14:30.581097154 +0000
-+++ kate-4.7.80/part/syntax/data/bash.xml	2011-11-20 06:14:45.494553146 +0000
-@@ -8,7 +8,7 @@
-         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
-         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD
deleted file mode 100644
index 09d1c8e63..000000000
--- a/kde-unstable/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,258 +0,0 @@
-# $Id: PKGBUILD 146156 2012-01-05 13:33:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
-         'kdesdk-dolphin-plugins'
-         'kdesdk-kapptemplate'
-         'kdesdk-kcachegrind'
-         'kdesdk-kdeaccounts-plugin'
-         'kdesdk-kdepalettes'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
-         'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
-         'kdesdk-lokalize'
-         'kdesdk-okteta'
-         'kdesdk-poxml'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
-         'kdesdk-umbrello')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
-             'kdebase-lib')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-python2-path.patch')
-sha1sums=('429c567cf97bd2a05076dcdc79397bb66be1cb70'
-          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# Fix hardcoded python2 cmd
-	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdesdk-cervisia() {
-	pkgdesc='CVS Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk-cervisia.install'
-	cd $srcdir/build/cervisia
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cervisia
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
-	pkgdesc='Extra Dolphin plugins'
-	depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
-	install='kdesdk.install'
-	cd $srcdir/build/dolphin-plugins/git
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dolphin-plugins/svn
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
-	pkgdesc='KDE Template Generator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kapptemplate/"
-	install='kdesdk.install'
-	cd $srcdir/build/kapptemplate
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapptemplate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
-	pkgdesc='Visualization of Performance Profiling Data'
-	depends=('kdebase-runtime' 'python2')
-	optdepends=('php: PHP support')
-	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk-kcachegrind.install'
-	cd $srcdir/build/kcachegrind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
-
-        # Fix python 2 path
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-                "${pkgdir}"/usr/bin/hotshot2calltree
-}
-
-package_kdesdk-kdeaccounts-plugin() {
-        pkgdesc='KDE Repository Accounts'
-        depends=('kdepim-runtime')
-        cd $srcdir/build/kdeaccounts-plugin
-        make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
-	pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
-	optdepends=('gimp')
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
-		$pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
-	depends=('kdebase-runtime' 'subversion')
-        install='kdesdk.install'
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
-	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kmtrace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmtrace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
-	pkgdesc='Diff/Patch Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kompare/"
-	install='kdesdk.install'
-	cd $srcdir/build/kompare
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
-	pkgdesc='A test application for KParts'
-	depends=('kdebase-runtime')
-	install='kdesdk.install'
-	cd $srcdir/build/kpartloader
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
-	pkgdesc='Macros helping to profile'
-	cd $srcdir/build/kprofilemethod
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
-	pkgdesc='An Object Inspector for Qt/KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kspy
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
-	pkgdesc='Startup time measurement tool for KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kstartperf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
-	pkgdesc='Qt Designer UI File Viewer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk-kuiviewer.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
-	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python')
-	url="http://kde.org/applications/development/lokalize/"
-	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk-lokalize.install'
-	cd $srcdir/build/lokalize
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
-}
-
-package_kdesdk-okteta() {
-	pkgdesc='Hex Editor'
-	depends=('kdebase-runtime')
-	replaces=('kdeutils-okteta')
-	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta/"
-	install='kdesdk-okteta.install'
-	cd $srcdir/build/okteta
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okteta
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
-	pkgdesc='Translates DocBook XML files using gettext po files'
-	depends=('qt' 'antlr2')
-	cd $srcdir/build/poxml
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
-	pkgdesc='An interface style to highlight accel and style guide conflicts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/scheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
-	pkgdesc='KDE SDK scripts'
-	depends=('python2')
-	cd $srcdir/build/scripts
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/scripts
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
-}
-
-package_kdesdk-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE SDK'
-	depends=('kdelibs')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
-	pkgdesc='UML Modeller'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk-umbrello.install'
-	cd $srcdir/build/umbrello
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
-}
diff --git a/kde-unstable/kdesdk/fix-python2-path.patch b/kde-unstable/kdesdk/fix-python2-path.patch
deleted file mode 100644
index 720487031..000000000
--- a/kde-unstable/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
-         print >>sys.stderr, "Execution failed:", e
- 
-     cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
--    if os.name!='nt': cmd='python '+cmd
-+    if os.name!='nt': cmd='python2 '+cmd
-     else: cmd=cmd.replace('/','\\')
-     os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~	2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py	2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
-     xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
- 
-     ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
--    os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+    os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
- 
- try: convert()
- except: print 'error occured'
---- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
- 
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
- 
- rm /tmp/accounts.$PPID
\ No newline at end of file
diff --git a/kde-unstable/kdesdk/kdesdk-cervisia.install b/kde-unstable/kdesdk/kdesdk-cervisia.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdesdk/kdesdk-cervisia.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk-kcachegrind.install b/kde-unstable/kdesdk/kdesdk-kcachegrind.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdesdk/kdesdk-kcachegrind.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk-kompare.install b/kde-unstable/kdesdk/kdesdk-kompare.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdesdk/kdesdk-kompare.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk-kuiviewer.install b/kde-unstable/kdesdk/kdesdk-kuiviewer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdesdk/kdesdk-kuiviewer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk-lokalize.install b/kde-unstable/kdesdk/kdesdk-lokalize.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdesdk/kdesdk-lokalize.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk-okteta.install b/kde-unstable/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/kde-unstable/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk-umbrello.install b/kde-unstable/kdesdk/kdesdk-umbrello.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdesdk/kdesdk-umbrello.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdesdk/kdesdk.install b/kde-unstable/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdesdk/kdesdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD
deleted file mode 100644
index 1df86a154..000000000
--- a/kde-unstable/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 146160 2012-01-05 13:36:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b7d2002e67f429c93172c019513b618ec0b9b546')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdetoys-amor() {
-	pkgdesc='On-Screen Creature'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/amor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/amor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc='Tea Cooker'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/kteatime
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kteatime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
-	pkgdesc='KTux'
-	depends=('kdebase-workspace' )
-	install='kdetoys.install'
-	cd $srcdir/build/ktux
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdetoys/kdetoys.install b/kde-unstable/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-filelight/PKGBUILD b/kde-unstable/kdeutils-filelight/PKGBUILD
deleted file mode 100644
index f98db1ede..000000000
--- a/kde-unstable/kdeutils-filelight/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 146166 2012-01-05 13:40:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-filelight
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='View disk usage information'
-url='http://kde.org/applications/utilities/filelight'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-replaces=('filelight')
-conflicts=('filelight')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/filelight-${pkgver}.tar.bz2")
-sha1sums=('188d174fdcde0facc3e32217b469a437c1d020c3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../filelight-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-filelight/kdeutils-filelight.install b/kde-unstable/kdeutils-filelight/kdeutils-filelight.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeutils-filelight/kdeutils-filelight.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-kcalc/PKGBUILD b/kde-unstable/kdeutils-kcalc/PKGBUILD
deleted file mode 100644
index e69b28f27..000000000
--- a/kde-unstable/kdeutils-kcalc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146167 2012-01-05 13:40:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcalc
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Scientific Calculator'
-url='http://kde.org/applications/utilities/kcalc/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kcalc-${pkgver}.tar.bz2")
-sha1sums=('5291b8a5b1b0c97dc0e6add0d9ed038f3acdba32')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcalc-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kcalc/kdeutils-kcalc.install b/kde-unstable/kdeutils-kcalc/kdeutils-kcalc.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeutils-kcalc/kdeutils-kcalc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-kcharselect/PKGBUILD b/kde-unstable/kdeutils-kcharselect/PKGBUILD
deleted file mode 100644
index e91d4785e..000000000
--- a/kde-unstable/kdeutils-kcharselect/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146168 2012-01-05 13:41:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcharselect
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Character Selector'
-url="http://kde.org/applications/utilities/kcharselect/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/unstable/${pkgver}/src/kcharselect-${pkgver}.tar.bz2")
-sha1sums=('e73359c349f922c62d7d6f61067af5c1628471b2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcharselect-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kdf/PKGBUILD b/kde-unstable/kdeutils-kdf/PKGBUILD
deleted file mode 100644
index 5eff38890..000000000
--- a/kde-unstable/kdeutils-kdf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146170 2012-01-05 13:42:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kdf
-pkgver=4.7.97
-pkgrel=1
-url="http://kde.org/applications/system/kdiskfree/"
-arch=('i686' 'x86_64')
-pkgdesc='View Disk Usage'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kdf-${pkgver}.tar.bz2")
-sha1sums=('0fef7e853126d600b4b3c9161c8b71ef6850f777')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kdf-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kdf/kdeutils-kdf.install b/kde-unstable/kdeutils-kdf/kdeutils-kdf.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeutils-kdf/kdeutils-kdf.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-kfloppy/PKGBUILD b/kde-unstable/kdeutils-kfloppy/PKGBUILD
deleted file mode 100644
index 823005bdd..000000000
--- a/kde-unstable/kdeutils-kfloppy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146171 2012-01-05 13:42:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kfloppy
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Floppy Formatter'
-url='http://kde.org/applications/utilities/kfloppy/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kfloppy-${pkgver}.tar.bz2")
-sha1sums=('fd83a0c9644bf84df8bea09120aa9d7275f13e96')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kfloppy-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kfloppy/kdeutils-kfloppy.install b/kde-unstable/kdeutils-kfloppy/kdeutils-kfloppy.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeutils-kfloppy/kdeutils-kfloppy.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-kgpg/PKGBUILD b/kde-unstable/kdeutils-kgpg/PKGBUILD
deleted file mode 100644
index 72c9e05c9..000000000
--- a/kde-unstable/kdeutils-kgpg/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146172 2012-01-05 13:43:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kgpg
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='A GnuPG frontend'
-url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepim-runtime' 'kde-agent')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kgpg-${pkgver}.tar.bz2")
-sha1sums=('6c876bc446b446f2a673b923eb89b4676f60de9b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgpg-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kgpg/kdeutils-kgpg.install b/kde-unstable/kdeutils-kgpg/kdeutils-kgpg.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeutils-kgpg/kdeutils-kgpg.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-kremotecontrol/PKGBUILD b/kde-unstable/kdeutils-kremotecontrol/PKGBUILD
deleted file mode 100644
index e3c64e877..000000000
--- a/kde-unstable/kdeutils-kremotecontrol/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kremotecontrol
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Configure your remote controls for use with applications'
-url='http://kde.org/applications/utilities/kremotecontrol/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-replaces=('kdeutils-kdelirc')
-conflicts=('kdeutils-kdelirc')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kremotecontrol-${pkgver}.tar.bz2")
-sha1sums=('9fe39efdbfe7e4d26980669474b420b3118bce8a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kremotecontrol-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/kde-unstable/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-ksecrets/PKGBUILD b/kde-unstable/kdeutils-ksecrets/PKGBUILD
deleted file mode 100644
index 84b0ba665..000000000
--- a/kde-unstable/kdeutils-ksecrets/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146175 2012-01-05 13:44:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ksecrets
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Secrets Management Infrastructure for KDE'
-url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksecrets-${pkgver}.tar.bz2")
-sha1sums=('780e7010ed098c6d1b65b6d5549d4a9606b383a4')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksecrets-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.install b/kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.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/kde-unstable/kdeutils-ktimer/PKGBUILD b/kde-unstable/kdeutils-ktimer/PKGBUILD
deleted file mode 100644
index 781e90b10..000000000
--- a/kde-unstable/kdeutils-ktimer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146176 2012-01-05 13:45:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ktimer
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Countdown Launcher'
-url='http://kde.org/applications/utilities/ktimer/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ktimer-${pkgver}.tar.bz2")
-sha1sums=('c0bc6886a325dcbcf246a6328ac693bb71661d02')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktimer-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-ktimer/kdeutils-ktimer.install b/kde-unstable/kdeutils-ktimer/kdeutils-ktimer.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdeutils-ktimer/kdeutils-ktimer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-kwallet/PKGBUILD b/kde-unstable/kdeutils-kwallet/PKGBUILD
deleted file mode 100644
index 006c50421..000000000
--- a/kde-unstable/kdeutils-kwallet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146177 2012-01-05 13:46:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kwallet
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='Wallet Management Tool'
-url='http://kde.org/applications/system/kwalletmanager/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kwallet-${pkgver}.tar.bz2")
-sha1sums=('73d301b9fb393788a52e1da344c8d1df372e784a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwallet-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-kwallet/kdeutils-kwallet.install b/kde-unstable/kdeutils-kwallet/kdeutils-kwallet.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdeutils-kwallet/kdeutils-kwallet.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdeutils-printer-applet/PKGBUILD b/kde-unstable/kdeutils-printer-applet/PKGBUILD
deleted file mode 100644
index 8120ab075..000000000
--- a/kde-unstable/kdeutils-printer-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 146179 2012-01-05 13:47:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-printer-applet
-pkgver=4.7.97
-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/unstable/${pkgver}/src/printer-applet-${pkgver}.tar.bz2")
-sha1sums=('7579b1f1a6a202a061acc850be3dbeefb2835d4d')
-
-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/kde-unstable/kdeutils-superkaramba/PKGBUILD b/kde-unstable/kdeutils-superkaramba/PKGBUILD
deleted file mode 100644
index d5b4a37cd..000000000
--- a/kde-unstable/kdeutils-superkaramba/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146180 2012-01-05 13:47:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-superkaramba
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='An engine for cool desktop eyecandy'
-url='http://kde.org/applications/utilities/superkaramba/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/superkaramba-${pkgver}.tar.bz2")
-sha1sums=('e6e0847eef5a7856ba5420e1f36488c0ea55ec30')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../superkaramba-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeutils-superkaramba/kdeutils-superkaramba.install b/kde-unstable/kdeutils-superkaramba/kdeutils-superkaramba.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeutils-superkaramba/kdeutils-superkaramba.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kdeutils-sweeper/PKGBUILD b/kde-unstable/kdeutils-sweeper/PKGBUILD
deleted file mode 100644
index 00f90cedf..000000000
--- a/kde-unstable/kdeutils-sweeper/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146182 2012-01-05 13:48:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-sweeper
-pkgver=4.7.97
-pkgrel=1
-pkgdesc='System Cleaner'
-url='http://kde.org/applications/utilities/sweeper'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/unstable/${pkgver}/src/sweeper-${pkgver}.tar.bz2")
-sha1sums=('9d5a3c7b84b97a0f11d741ffcf99b096504db15d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../sweeper-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD
deleted file mode 100644
index c6181f739..000000000
--- a/kde-unstable/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 146163 2012-01-05 13:37:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
-         'kdewebdev-kimagemapeditor'
-         'kdewebdev-klinkstatus'
-         'kdewebdev-kommander')
-pkgver=4.7.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('accd2857d98a6d3f62d4a961e85d14166e558587')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdewebdev-kfilereplace() {
-	pkgdesc='Search & Replace Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfilereplace/"
-	install='kdewebdev.install'
-	cd $srcdir/build/kfilereplace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfilereplace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
-	pkgdesc='HTML Image Map Editor'
-	depends=('kdebase-runtime')
-        url="http://www.kde.org/applications/development/kimagemapeditor/"
-	install='kdewebdev-kimagemapeditor.install'
-	cd $srcdir/build/kimagemapeditor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kimagemapeditor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
-	pkgdesc='Link Checker'
-	depends=('kdepim-runtime' 'tidyhtml')
-        url="http://www.kde.org/applications/development/klinkstatus/"
-	install='kdewebdev.install'
-	cd $srcdir/build/klinkstatus
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klinkstatus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
-	pkgdesc='Executor for Kommander dialogs'
-	depends=('kdebase-runtime')
-        url="http://www.kde.org/applications/development/kommander/"
-	cd $srcdir/build/kommander
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdewebdev/kdewebdev-kimagemapeditor.install b/kde-unstable/kdewebdev/kdewebdev-kimagemapeditor.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdewebdev/kdewebdev-kimagemapeditor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/kde-unstable/kdewebdev/kdewebdev.install b/kde-unstable/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdewebdev/kdewebdev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD
deleted file mode 100644
index ffb4e98d7..000000000
--- a/kde-unstable/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146098 2012-01-05 12:35:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b0aabc3bea00698feed45f180516cbb1c8668e88')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libkdcraw/libkdcraw.install b/kde-unstable/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/libkdcraw/libkdcraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD
deleted file mode 100644
index 3d7954147..000000000
--- a/kde-unstable/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146096 2012-01-05 12:34:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4be06090b25247209bbd48c1fb8f73c79b9fabc9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libkdeedu/libkdeedu.install b/kde-unstable/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/libkdeedu/libkdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD
deleted file mode 100644
index f6625e05c..000000000
--- a/kde-unstable/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146099 2012-01-05 12:36:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4f58b9203a5810308d425f4b49876ac3015d2589')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD
deleted file mode 100644
index 0aa1a3fa0..000000000
--- a/kde-unstable/libkipi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkipi
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1ab76e3d3330418b3a88098601f5f5f61bc03f3d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libkipi/libkipi.install b/kde-unstable/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/libkipi/libkipi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD
deleted file mode 100644
index 4b658edee..000000000
--- a/kde-unstable/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146101 2012-01-05 12:37:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.7.97
-pkgrel=1
-pkgdesc="An image scanning library"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'sane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e054587283f4c528ae0c1cea4b716081547b57b7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libksane/libksane.install b/kde-unstable/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/libksane/libksane.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kdeutils-libre/PKGBUILD b/libre/kdeutils-libre/PKGBUILD
deleted file mode 100644
index 16fff37d3..000000000
--- a/libre/kdeutils-libre/PKGBUILD
+++ /dev/null
@@ -1,194 +0,0 @@
-# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark-libre'
-         'kdeutils-filelight'
-         'kdeutils-kcalc'
-         'kdeutils-kcharselect'
-         'kdeutils-kdf'
-         'kdeutils-kfloppy'
-         'kdeutils-kgpg'
-         'kdeutils-kremotecontrol'
-         'kdeutils-ktimer'
-         'kdeutils-kwallet'
-         'kdeutils-printer-applet'
-         'kdeutils-superkaramba'
-         'kdeutils-sweeper')
-pkgver=4.7.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
-	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
-	'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e')
-
-build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    
-    # Use Python2
-    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
-      kcharselect/kcharselect-generate-datafile.py \
-      superkaramba/examples/richtext/rtext.py
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdeutils-ark-libre() {
-	pkgdesc='Archiving Tool'
-	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
-	provides=("kdeutils-ark=$pkgver")
-	replaces=('kdeutils-ark')
-	conflicts=('kdeutils-ark')
-	url="http://kde.org/applications/utilities/ark/"
-	cd $srcdir/build/ark
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ark/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
-	pkgdesc='View disk usage information'
-	depends=('kdebase-runtime' 'qimageblitz')
-	replaces=('filelight')
-	conflicts=('filelight')
-	install='kdeutils.install'
-	url="http://methylblue.com/filelight/"
-	cd $srcdir/build/filelight
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/filelight/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
-	pkgdesc='Scientific Calculator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcalc/"
-	cd $srcdir/build/kcalc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcalc/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
-	pkgdesc='Character Selector'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcharselect/"
-	cd $srcdir/build/kcharselect
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcharselect/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
-	pkgdesc='View Disk Usage'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kdiskfree/"
-	install='kdeutils.install'
-	cd $srcdir/build/kdf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kdf/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
-	pkgdesc='Floppy Formatter'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfloppy/"
-	install='kdeutils.install'
-	cd $srcdir/build/kfloppy
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kfloppy/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
-	pkgdesc='A GnuPG frontend'
-	depends=('kdepim-runtime' 'kde-agent')
-	url="http://kde.org/applications/utilities/kgpg"
-	install='kdeutils.install'
-	cd $srcdir/build/kgpg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgpg/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
-	pkgdesc='Configure your remote controls for use with applications'
-	replaces=('kdeutils-kdelirc')
-	conflicts=('kdeutils-kdelirc')
-	depends=('kdebase-workspace')
-	url="http://kde.org/applications/utilities/kremotecontrol"
-	install='kdeutils.install'
-	cd $srcdir/build/kremotecontrol
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kremotecontrol/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
-	pkgdesc='Countdown Launcher'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/ktimer"
-	install='kdeutils.install'
-	cd $srcdir/build/ktimer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ktimer/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
-	pkgdesc='Wallet Management Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kwalletmanager/"
-	install='kdeutils.install'
-	cd $srcdir/build/kwallet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwallet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
-	pkgdesc='System tray icon for managing print jobs'
-	depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/printer-applet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/printer-applet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-superkaramba() {
-	pkgdesc='An engine for cool desktop eyecandy'
-	depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
-	url="http://kde.org/applications/utilities/superkaramba"
-	install='kdeutils.install'
-	cd $srcdir/build/superkaramba
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
-	pkgdesc='System Cleaner'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/sweeper/"
-	cd $srcdir/build/sweeper
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/sweeper/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/libre/kdeutils-libre/fix-kcalc-keys.patch b/libre/kdeutils-libre/fix-kcalc-keys.patch
deleted file mode 100644
index 0bfc4b3b2..000000000
--- a/libre/kdeutils-libre/fix-kcalc-keys.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- trunk/KDE/kdeutils/kcalc/kcalc.ui	2011/07/06 18:27:29	1240129
-+++ trunk/KDE/kdeutils/kcalc/kcalc.ui	2011/07/06 18:27:58	1240130
-@@ -616,7 +616,7 @@
-              <string>7</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">7</string>
-+             <string>7</string>
-             </property>
-            </widget>
-           </item>
-@@ -632,7 +632,7 @@
-              <string>8</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">8</string>
-+             <string>8</string>
-             </property>
-            </widget>
-           </item>
-@@ -648,7 +648,7 @@
-              <string>9</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">9</string>
-+             <string>9</string>
-             </property>
-            </widget>
-           </item>
-@@ -680,7 +680,7 @@
-              <string>4</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">4</string>
-+             <string>4</string>
-             </property>
-            </widget>
-           </item>
-@@ -696,7 +696,7 @@
-              <string>5</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">5</string>
-+             <string>5</string>
-             </property>
-            </widget>
-           </item>
-@@ -712,7 +712,7 @@
-              <string>6</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">6</string>
-+             <string>6</string>
-             </property>
-            </widget>
-           </item>
-@@ -728,7 +728,7 @@
-              <string>1</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">1</string>
-+             <string>1</string>
-             </property>
-            </widget>
-           </item>
-@@ -744,7 +744,7 @@
-              <string>2</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">2</string>
-+             <string>2</string>
-             </property>
-            </widget>
-           </item>
-@@ -760,7 +760,7 @@
-              <string>3</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">3</string>
-+             <string>3</string>
-             </property>
-            </widget>
-           </item>
-@@ -786,7 +786,7 @@
-              <string>0</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">0</string>
-+             <string>0</string>
-             </property>
-            </widget>
-           </item>
-
diff --git a/libre/kdeutils-libre/kdeutils.install b/libre/kdeutils-libre/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/libre/kdeutils-libre/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kdeutils-libre/rePKGBUILD b/libre/kdeutils-libre/rePKGBUILD
deleted file mode 100644
index 9dad18cf0..000000000
--- a/libre/kdeutils-libre/rePKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-#CARCH=x86_64
-unset build package md5sums source
-pkgname=("kdeutils-ark-libre")
-_repo=extra       # Put the repo here
-_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here
-source=(PKGBUILD
-        "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
-        # files for pkg modifications below this line
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm -vf .{INSTALL,PKGINFO} || true
-  # put actions for package modifications below this line
-
-}
-
-package_kdeutils-ark-libre() {
-	pkgdesc='Archiving Tool'
-	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
-	provides=("kdeutils-ark=$pkgver")
-	replaces=('kdeutils-ark')
-	conflicts=('kdeutils-ark')
-	url="http://kde.org/applications/utilities/ark/"
-	find ${srcdir} -maxdepth 1 -type l -delete
-	cp -a ${srcdir}/* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/texlive-bin-libre/archlinux-build.patch b/libre/texlive-bin-libre/archlinux-build.patch
deleted file mode 100644
index accb97a7a..000000000
--- a/libre/texlive-bin-libre/archlinux-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur source.old/texk/am/script_links.am source/texk/am/script_links.am
---- source.old/texk/am/script_links.am	2011-05-02 13:54:33.000000000 +0200
-+++ source/texk/am/script_links.am	2011-06-05 11:22:53.118216353 +0200
-@@ -51,8 +51,8 @@
- # We support both multiplatform and non-multiplatform builds.
- install-links:
- 	case "$(bindir)" in \
--	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
--	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- 	  *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
- 	     exit 1;; \
- 	esac
-diff -ur source.old/texk/tetex/Makefile.am source/texk/tetex/Makefile.am
---- source.old/texk/tetex/Makefile.am	2011-05-31 11:47:04.000000000 +0200
-+++ source/texk/tetex/Makefile.am	2011-06-05 10:28:40.287025375 +0200
-@@ -35,7 +35,7 @@
- 
- include $(srcdir)/../am/script_links.am
- 
--texmfdir = ${prefix}/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
- 
- if !WIN32
-diff -ur source.old/texk/texlive/linked_scripts/Makefile.am source/texk/texlive/linked_scripts/Makefile.am
---- source.old/texk/texlive/linked_scripts/Makefile.am	2011-05-31 11:47:04.000000000 +0200
-+++ source/texk/texlive/linked_scripts/Makefile.am	2011-06-05 09:41:50.997250443 +0200
-@@ -165,8 +165,8 @@
- 	done
- else !WIN32
- 	case "$(bindir)" in \
--	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
--	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
-+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
- 	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
- 	     exit 1;; \
- 	esac
diff --git a/multilib-staging/binutils-multilib/PKGBUILD b/multilib-staging/binutils-multilib/PKGBUILD
deleted file mode 100644
index 4b8a09454..000000000
--- a/multilib-staging/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 62031 2012-01-14 21:44:56Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils-multilib
-pkgver=2.22
-pkgrel=4.1
-_date=20111227
-pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('multilib-devel')
-provides=("binutils=$pkgver-$pkgrel")
-conflicts=('binutils')
-depends=('glibc>=2.14' 'zlib')
-makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared \
-    --enable-64-bit-bfd --enable-multilib
-
-  # check the host environment and makes sure all the necessary tools are available
-  make configure-host
-
-  make tooldir=${pkgdir}/usr
-
-  # Rebuild libiberty.a with -fPIC
-  cp -a libiberty libiberty-pic
-  make -C libiberty-pic clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
-  # Rebuild libbfd.a with -fPIC
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  cp -a bfd bfd-pic
-  make -C bfd-pic clean
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  make -k -j1 check || true
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
-  # install libraries rebuilt with -fPIC
-  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
-  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
-
-  # Remove Windows/Novell specific man pages
-  rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
-  # Remove these symlinks, they are not ABI stable.
-  # Programs should compile static to the .a file.
-  rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
-  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
-  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/multilib-staging/binutils-multilib/binutils.install b/multilib-staging/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib-staging/binutils-multilib/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/multilib-staging/chuck/PKGBUILD b/multilib-staging/chuck/PKGBUILD
deleted file mode 100644
index 333d7f73d..000000000
--- a/multilib-staging/chuck/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62037 2012-01-14 23:38:40Z heftig $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-
-pkgname=chuck
-pkgver=1.2.1.3
-pkgrel=5.1
-pkgdesc="Concurrent, on-the-fly audio programming language."
-arch=('i686' 'x86_64')
-url="http://chuck.cs.princeton.edu/"
-license=('GPL')
-depends=('gcc-libs' 'libsndfile' 'alsa-lib')
-makedepends=('bison' 'flex')
-source=(http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz)
-md5sums=('ac8459b4067c2491fbdeb61d122a5985')
-
-if [[ $CARCH == x86_64 ]]; then
-	depends=('lib32-gcc-libs' 'lib32-libsndfile' 'lib32-alsa-lib')
-	makedepends+=('gcc-multilib')
-fi
-
-build() {
-	if [[ $CARCH == x86_64 ]]; then
-		export CC='gcc -m32'
-		export CXX='g++ -m32'
-		export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-	fi
-
-	cd $srcdir/$pkgname-$pkgver/src
-	CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-	# This can be linux-alsa linux-jack linux-oss osx win32
-	make linux-alsa
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver/src
-	install -D -m 755 chuck $pkgdir/usr/bin/chuck
-}
diff --git a/multilib-staging/gcc-multilib/PKGBUILD b/multilib-staging/gcc-multilib/PKGBUILD
deleted file mode 100644
index 7fed692d9..000000000
--- a/multilib-staging/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,303 +0,0 @@
-# $Id: PKGBUILD 62033 2012-01-14 22:04:04Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.2
-pkgrel=5.1
-_snapshot=4.6-20111223
-_libstdcppmanver=20111215
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
-             'lib32-glibc>=2.14')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64-multilib.patch
-	gcc-hash-style-both.patch)
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
-         '450772ce32daed97d7383199f8797f33'
-         '7da5b7ab75b3c29993f953b18bc38579'
-         '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  patch -Np1 -i ${srcdir}/gcc_pure64-multilib.patch
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --enable-multilib --disable-libssp --disable-libstdcxx-pch \
-      --enable-checking=release --with-fpmath=sse
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
-  provides=("gcc-libs=$pkgver-$pkgrel")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -rf ${pkgdir}/usr/lib32
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm ${pkgdir}/usr/lib32/libgfortran.spec
-
-  # remove stuff in gcc-libs-multilib
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/info
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl')
-  groups=('multilib-devel')
-  provides=("gcc=$pkgver-$pkgrel")
-  conflicts=('gcc')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib{,32}/*.so*
-  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib{,32}/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
-  pkgdesc="Fortran front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-fortran=$pkgver-$pkgrel")
-  conflicts=('gcc-fortran')
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
-  pkgdesc="Objective-C front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-objc=$pkgver-$pkgrel")
-  conflicts=('gcc-objc')
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
-  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-ada=$pkgver-$pkgrel")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  cd ../$CHOST/32/libada
-  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
-    INSTALL_DATA="install -m644" install-gnatlib
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-staging/gcc-multilib/gcc-ada.install b/multilib-staging/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-staging/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc-fortran.install b/multilib-staging/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-staging/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-staging/gcc-multilib/gcc-go.install b/multilib-staging/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-staging/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc-hash-style-both.patch b/multilib-staging/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-staging/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-staging/gcc-multilib/gcc-libs.install b/multilib-staging/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-staging/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc.install b/multilib-staging/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-staging/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch b/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch
deleted file mode 100644
index 73df6b873..000000000
--- a/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h
---- gcc-4.6-20111223/gcc/config/i386/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h	2012-01-14 19:52:33.688573352 +0100
-@@ -63,7 +63,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64
---- gcc-4.6-20111223/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64	2012-01-14 19:50:27.346242617 +0100
-@@ -25,7 +25,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib-staging/jack2-multilib/40-hpet-permissions.rules b/multilib-staging/jack2-multilib/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/multilib-staging/jack2-multilib/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/multilib-staging/jack2-multilib/99-audio.conf b/multilib-staging/jack2-multilib/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/multilib-staging/jack2-multilib/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/multilib-staging/jack2-multilib/PKGBUILD b/multilib-staging/jack2-multilib/PKGBUILD
deleted file mode 100644
index 9c7e0fd6f..000000000
--- a/multilib-staging/jack2-multilib/PKGBUILD
+++ /dev/null
@@ -1,142 +0,0 @@
-# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-# This one is in response to a need for an equivalent to lib32-jack for
-# jack2. A lib32-jack2 would require much patching and invading the pure
-# jack2 package, and what's more, the buildsystem provides a flag just to
-# build a hybrid jack2 in full. As such, we have opted to provide multilib
-# users with a replacement package instead of the usual lib32 add-on.
-#
-# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
-
-pkgbase=jack2-multilib
-pkgname=('jack2-multilib' 'jack2-dbus-multilib')
-#pkgname= # single build (overrides split)
-_tarname=jack
-pkgver=1.9.7
-pkgrel=2
-arch=('x86_64')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-license=('GPL')
-makedepends=('python2' 'libffado' 'libsamplerate' 'celt'
-             'doxygen' 'gcc-multilib' 'lib32-dbus-core')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2"
-        '99-audio.conf'
-        '40-hpet-permissions.rules')
-md5sums=('9759670feecbd43eeccf1c0f743ec199'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef')
-
-_pyfix() {
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/jack_control"
-}
-
-_wafconf() {
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --firewire \
-                        --mixed \
-                        --doxygen $@
-}
-
-_isbuild() {
-  printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-_mklinks() {
-  ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0"
-  ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so"
-}
-
-build() {
-  cd "$srcdir"
-
-  # fix doxygen building
-  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
-
-  # we may do 2 different builds
-  cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
-
-  # mixed dbus/classic build
-  if _isbuild jack2-multilib; then
-    cd $_tarname-$pkgver
-    msg2 "Running Mixed D-Bus/Classic build"
-    _wafconf --classic --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-
-  # dbus-ONLY build
-  if _isbuild jack2-dbus-multilib; then
-    cd $_tarname-dbus-$pkgver
-    msg2 "Running D-Bus-only build"
-    _wafconf --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-}
-
-package_jack2-multilib() {
-  ! _isbuild jack2-multilib && return 0
-
-  pkgdesc="The next-generation JACK with SMP support & mixed mode"
-  depends=('libsamplerate' 'gcc-libs-multilib')
-  optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
-              'lib32-dbus-core: jackdbus'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2' 'lib32-jack')
-  provides=('jack' 'jack2' 'lib32-jack' 'jackmp'
-            'jackdmp' 'jackdbus' 'lib32-jack2')
-
-  cd "$srcdir/$_tarname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-
-  # fix for major python transition
-  _pyfix
-
-  # configure realtime access/scheduling
-  # see https://bugs.archlinux.org/task/26343
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  # should be done by upstream
-  # see http://trac.jackaudio.org/ticket/200
-  _mklinks
-}
-
-package_jack2-dbus-multilib() {
-  ! _isbuild jack2-dbus-multilib && return 0
-
-  pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
-  depends=('libsamplerate' 'lib32-dbus-core')
-  optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
-  provides=('jack' 'jack2' 'lib32-jack' 'jack2-multilib'
-            'jackmp' 'jackdmp' 'jackdbus' 'lib32-jack2')
-
-  cd "$srcdir/$_tarname-dbus-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-
-  _pyfix
-
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  _mklinks
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-staging/lib32-cairo/PKGBUILD b/multilib-staging/lib32-cairo/PKGBUILD
deleted file mode 100644
index 394a26fbe..000000000
--- a/multilib-staging/lib32-cairo/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62413 2012-01-19 21:13:41Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.10.2
-pkgrel=3
-pkgdesc="Cairo vector graphics library (32-bit)"
-arch=('x86_64')
-url="http://cairographics.org/"
-license=('LGPL' 'MPL')
-depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig'
-         'lib32-pixman' 'lib32-glib2' ${_pkgbasename})
-makedepends=('gcc-multilib')
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-      --sysconfdir=/etc  --localstatedir=/var \
-      --disable-static --enable-tee
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

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

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

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

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

-      */

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

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index 28b102d55..000000000
--- a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.1
-pkgrel=2
-pkgdesc="An image loading library (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11
-         $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool' '!docs')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  ./configure --prefix=/usr  --libdir=/usr/lib32 \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32
-  rm gdk-pixbuf-csource
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 92d58ef04..000000000
--- a/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/multilib-staging/lib32-glib2/PKGBUILD b/multilib-staging/lib32-glib2/PKGBUILD
deleted file mode 100644
index a1a1f36f3..000000000
--- a/multilib-staging/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 62040 2012-01-14 23:44:48Z heftig $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.30.2
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0}
-}
diff --git a/multilib-staging/lib32-glibc/PKGBUILD b/multilib-staging/lib32-glibc/PKGBUILD
deleted file mode 100644
index ed4d6efa8..000000000
--- a/multilib-staging/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,176 +0,0 @@
-# $Id: PKGBUILD 62030 2012-01-14 21:43:25Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.15
-pkgrel=3.1
-_glibcdate=20111227
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.6')
-options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
-        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
-        glibc-__i686.patch
-        glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
-        glibc-2.14-reexport-rpc-interface.patch
-        glibc-2.14-reinstall-nis-rpc-headers.patch
-        glibc-2.15-lddebug-scopes.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.15-math64crash.patch
-        lib32-glibc.conf)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
-  cd ${srcdir}/glibc
-
-  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
-  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
-  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
-  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely:
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
-  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
-  # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=769421
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # revert optimized math routines that can cause crashes (FS#27736, FS#27743)
-  # obviously not a real fix...
-  patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  export CC="gcc -m32"
-
-  # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-  export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
-  echo "slibdir=/usr/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --enable-multi-arch i686-unknown-linux-gnu
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "s#=no#=yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
-
-  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
-
-  # We need one 32 bit specific header file
-  find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
-  cd $pkgdir
-  strip $STRIP_BINARIES usr/lib32/getconf/*
-
-  strip $STRIP_STATIC usr/lib32/*.a
-
-  strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/lib
-  ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/
-
-  # Add lib32 paths to the default library search path
-  install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
-  # Symlink /usr/lib32/locale to /usr/lib/locale
-  ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-}
diff --git a/multilib-staging/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-staging/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-staging/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-staging/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-staging/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-staging/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-staging/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-staging/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }
--- 
-1.7.2
diff --git a/multilib-staging/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-staging/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- 
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/multilib-staging/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-staging/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-staging/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-staging/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/multilib-staging/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-staging/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-staging/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-staging/lib32-glibc/glibc-2.15-lddebug-scopes.patch b/multilib-staging/lib32-glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	      char *copy = malloc (len);
- 	      if (copy == NULL)
- 		_dl_fatal_printf ("out of memory\n");
--	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+	      l->l_libname->name = memcpy (copy, dsoname, len);
-+	      if (GLRO(dl_debug_mask))
-+		l->l_name = copy;
- 	    }
- 
- 	  /* Add the vDSO to the object list.  */
--- 
-1.7.3.4
-
diff --git a/multilib-staging/lib32-glibc/glibc-2.15-math64crash.patch b/multilib-staging/lib32-glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- 			s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
- 
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
--	.type	__ceil, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__ceil_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__ceil_c(%rip), %rax
--2:	ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
--	roundsd	$2, %xmm0, %xmm0
--	ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
--	.type	__floor, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__floor_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__floor_c(%rip), %rax
--2:	ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
--	roundsd	$1, %xmm0, %xmm0
--	ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __cos_fma4 ((void *) 0)
--#  define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/multilib-staging/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-staging/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	18f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- 	movl	%ebp, %edx
- 	xorl	%esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- 	sete	16(%esp)
- 	je	19f
- 
--	cmpl	$-EAGAIN, %eax
--	je	91f
--
- 	/* Normal and PI futexes dont mix. Use normal futex functions only
- 	   if the kernel does not support the PI futex functions.  */
- 	cmpl	$-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- 	call	__lll_unlock_wake
- 	jmp	11b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--
--	/* Get internal lock.  */
--	movl	$1, %edx
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %edx, (%ebx)
--#else
--	cmpxchgl %edx, cond_lock(%ebx)
--#endif
--	jz	92f
--
--#if cond_lock == 0
--	movl	%ebx, %edx
--#else
--	leal	cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_lock_wait
--
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	addl	$1, cond_futex(%ebx)
--	movl	cond_futex(%ebx), %ebp
--
--	/* Unlock.  */
--	LOCK
--#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	je	93f
--#if cond_lock == 0
--	movl	%ebx, %eax
--#else
--	leal	cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_unlock_wake
--
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorl	%ecx, %ecx
--	movl	dep_mutex(%ebx), %edi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- 	.long	.LcleanupEND-.Lsub_cond_futex
- 	.long	__condvar_w_cleanup-.LSTARTCODE
- 	.uleb128  0
--	.long	.LcleanupSTART2-.LSTARTCODE
--	.long	.LcleanupEND2-.LcleanupSTART2
--	.long	__condvar_w_cleanup-.LSTARTCODE
--	.uleb128  0
- 	.long	.LcallUR-.LSTARTCODE
- 	.long	.LENDCODE-.LcallUR
- 	.long	0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- 
- #include <kernel-features.h>
- 
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	61f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- 	movl	$SYS_futex, %eax
- 	syscall
- 
- 	movl	$1, %r8d
--	cmpq	$-EAGAIN, %rax
--	je	91f
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
- 
- 13:	movq	%r10, %rax
- 	jmp	14b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--	movq	8(%rsp), %rdi
--
--	/* Get internal lock.  */
--	movl	$1, %esi
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %esi, (%rdi)
--#else
--	cmpxchgl %esi, cond_lock(%rdi)
--#endif
--	jz	92f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	cmpq	$-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	callq	__lll_lock_wait
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	incl	cond_futex(%rdi)
--	movl	cond_futex(%rdi), %edx
--
--	/* Release internal lock.  */
--	LOCK
--#if cond_lock == 0
--	decl	(%rdi)
--#else
--	decl	cond_lock(%rdi)
--#endif
--	jz	93f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	cmpq	$-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	/* The call preserves %rdx.  */
--	callq	__lll_unlock_wake
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorq	%r10, %r10
--	movq	dep_mutex(%rdi), %r8
--	leaq	cond_futex(%rdi), %rdi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupSTART-.LSTARTCODE
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
-+	.uleb128  0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
--	.uleb128 0
-+	.uleb128  0
- .Lcstend:
- 
- 
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/multilib-staging/lib32-glibc/glibc-__i686.patch b/multilib-staging/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib-staging/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think).  Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
- 
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/multilib-staging/lib32-glibc/lib32-glibc.conf b/multilib-staging/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index 9b08c3f43..000000000
--- a/multilib-staging/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib32
diff --git a/multilib-staging/lib32-gtk2/PKGBUILD b/multilib-staging/lib32-gtk2/PKGBUILD
deleted file mode 100644
index b9c9036ca..000000000
--- a/multilib-staging/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 62043 2012-01-14 23:45:58Z bluewind $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=gtk2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.8
-pkgrel=2
-pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-install=gtk2.install
-depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gdk-pixbuf2>=2.22.1'}
-         lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage}
-         $_pkgbasename)
-makedepends=('pkgconfig' 'gcc-multilib')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch
-        gtk-modules-32.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-  patch -p1 -i ${srcdir}/gtk-modules-32.patch
-
-  CXX=/bin/false ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libdir=/usr/lib32 \
-      --with-xinput=yes
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd "${srcdir}/gtk+-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32
-  rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache
-}
diff --git a/multilib-staging/lib32-gtk2/gtk-modules-32.patch b/multilib-staging/lib32-gtk2/gtk-modules-32.patch
deleted file mode 100644
index a2530c3bf..000000000
--- a/multilib-staging/lib32-gtk2/gtk-modules-32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c
---- gtk+-2.20.1/gtk/gtkrc.c	2010-05-03 01:28:21.000000000 +0200
-+++ gtk+-2.20.1-32/gtk/gtkrc.c	2010-08-26 07:22:42.316920033 +0200
-@@ -450,7 +450,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL);
-     }
- 
-   return result;
diff --git a/multilib-staging/lib32-gtk2/gtk2.install b/multilib-staging/lib32-gtk2/gtk2.install
deleted file mode 100644
index 49f86f550..000000000
--- a/multilib-staging/lib32-gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null
-}
diff --git a/multilib-staging/lib32-gtk2/xid-collision-debug.patch b/multilib-staging/lib32-gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/multilib-staging/lib32-gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/multilib-staging/lib32-libcanberra/PKGBUILD b/multilib-staging/lib32-libcanberra/PKGBUILD
deleted file mode 100644
index eecaeabfb..000000000
--- a/multilib-staging/lib32-libcanberra/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 62699 2012-01-24 21:00:53Z heftig $
-# Maintainer: Florian Pritz <flo@xssn.at>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libcanberra
-pkgbase=lib32-$_pkgbasename
-pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
-pkgver=0.28
-pkgrel=2
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)"
-arch=(x86_64)
-license=('LGPL')
-depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb'
-         $_pkgbasename)
-makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib)
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=("$url/$_pkgbasename-$pkgver.tar.gz")
-md5sums=('c198b4811598c4c161ff505e4531b02c')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \
-      --libdir=/usr/lib32
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_lib32-libcanberra() {
-  optdepends=("$pkgbase-pulse: PulseAudio driver")
-
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la"
-  rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la
-
-
-  # Split libcanberra-pulse
-  mkdir pulse-plugin
-  mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin
-
-  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}}
-}
-
-package_lib32-libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra (32-bit)"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse')
-
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" 
-}
diff --git a/multilib-staging/lib32-libcups/PKGBUILD b/multilib-staging/lib32-libcups/PKGBUILD
deleted file mode 100644
index 010da0cf7..000000000
--- a/multilib-staging/lib32-libcups/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 62421 2012-01-19 21:25:14Z bluewind $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="The CUPS Printing System - client libraries (32-bit)"
-arch=('x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename)
-makedepends=(gcc-multilib)
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
-md5sums=('e54ed09ede2340fc3014913333520fe4')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/cups-${pkgver}
-  
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
-     --enable-ssl=no --disable-gnutls --enable-threads \
-     --with-optim="$CFLAGS" --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/cups-${pkgver}
-  make BUILDROOT=${pkgdir} install-libs
-}
-
diff --git a/multilib-staging/lib32-libpng/PKGBUILD b/multilib-staging/lib32-libpng/PKGBUILD
deleted file mode 100644
index 448a475b5..000000000
--- a/multilib-staging/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 62262 2012-01-18 20:55:36Z 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.7
-_apngver=1.5.7
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)"
-arch=('x86_64')
-url="http://www.libpng.org/pub/png/libpng.html"
-license=('custom')
-depends=('lib32-zlib' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
-md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d'
-         '6c6a674048cec94db1bc35decf0d142c')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-staging/lib32-libtiff/PKGBUILD b/multilib-staging/lib32-libtiff/PKGBUILD
deleted file mode 100644
index 2d6eb6a8e..000000000
--- a/multilib-staging/lib32-libtiff/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62312 2012-01-19 07:50:29Z bluewind $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-_pkgbasename=libtiff
-pkgname=lib32-$_pkgbasename
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="Library for manipulation of TIFF images (32-bit)"
-arch=('x86_64')
-url="http://www.remotesensing.org/libtiff/"
-license=('custom')
-depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/tiff-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32
-  make
-}
-
-check() {
- cd "${srcdir}/tiff-${pkgver}"
- make check
-}
-
-package() {
-  cd "${srcdir}/tiff-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch
deleted file mode 100644
index 435a84b53..000000000
--- a/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: tiff-3.8.2/libtiff/tif_lzw.c
-===================================================================
---- tiff-3.8.2.orig/libtiff/tif_lzw.c
-+++ tiff-3.8.2/libtiff/tif_lzw.c
-@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
- 			NextCode(tif, sp, bp, code, GetNextCode);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
-@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
diff --git a/multilib-staging/lib32-pango/PKGBUILD b/multilib-staging/lib32-pango/PKGBUILD
deleted file mode 100644
index ced19ae83..000000000
--- a/multilib-staging/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 62959 2012-01-29 16:08:26Z bluewind $
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-# Maintainer: Biru Ionut <ionut@archlinux.ro>
-_pkgbasename=pango
-pkgname=lib32-$_pkgbasename
-pkgver=1.29.4
-pkgrel=3
-pkgdesc="A library for layout and rendering of text (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-glib2>=2.25.15' 'lib32-cairo>=1.10.0' 'lib32-libxft>=2.1.14'
-         'lib32-freetype2>=2.4.2' $_pkgbasename)
-makedepends=("gcc-multilib")
-options=('!libtool' '!emptydirs')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.29/${_pkgbasename}-${pkgver}.tar.xz
-        pango-modules-conffile.patch)
-url="http://www.pango.org/"
-sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f'
-            '4a178b60dd420ae53baeabbecfaaeca4070a4b777b2b3f36d137cd70b5a270c3')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -p0 < ${srcdir}/pango-modules-conffile.patch
-  # No libthai support yet
-  ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc \
-      --with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \
-      --disable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "$pkgdir"/etc
-  rm -rf "$pkgdir"/usr/{bin/pango-view,share,include}
-  mv "$pkgdir"/usr/bin/pango-querymodules "$pkgdir"/usr/bin/pango-querymodules-32
-}
diff --git a/multilib-staging/lib32-pango/pango-modules-conffile.patch b/multilib-staging/lib32-pango/pango-modules-conffile.patch
deleted file mode 100644
index a959cf1c8..000000000
--- a/multilib-staging/lib32-pango/pango-modules-conffile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pango/modules.c.orig	2010-08-26 06:45:49.329259966 +0200
-+++ pango/modules.c	2010-08-26 06:46:13.786685177 +0200
-@@ -529,7 +529,7 @@
- 
-   if (!file_str)
-     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
--				 "pango.modules",
-+				 "pango.modules-32",
- 				 NULL);
- 
-   files = pango_split_file_list (file_str);
-@@ -640,7 +640,7 @@
-       if (!no_module_warning)
- 	{
- 	  gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
--					      "pango.modules",
-+					      "pango.modules-32",
- 					      NULL);
- 	  g_critical ("No modules found:\n"
- 		      "No builtin or dynamically loaded modules were found.\n"
diff --git a/multilib-staging/lib32-pango/pango.install b/multilib-staging/lib32-pango/pango.install
deleted file mode 100644
index 173b6820f..000000000
--- a/multilib-staging/lib32-pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules-32 >etc/pango/pango.modules-32
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f etc/pango/pango.modules-32 ]; then
-		rm etc/pango/pango.modules-32
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules-32
-}
diff --git a/multilib-staging/lib32-qt/PKGBUILD b/multilib-staging/lib32-qt/PKGBUILD
deleted file mode 100644
index 205e21a76..000000000
--- a/multilib-staging/lib32-qt/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 62425 2012-01-19 21:55:49Z bluewind $
-# Maintainer: Florian Pritz <flo@xssn.at>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=qt
-pkgname=lib32-$_pkgbasename
-pkgver=4.8.0
-pkgrel=2
-pkgdesc='A cross-platform application and UI framework (32-bit)'
-arch=('x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl}
-         lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename)
-optdepends=('lib32-libxinerama: Xinerama support'
-            'lib32-libxcursor: Xcursor support'
-            'lib32-libxfixes: Xfixes support')
-makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2})
-options=('!libtool')
-_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}"
-source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904')
-
-build() {
-  cd $srcdir/$_pkgfqn
-
-  export QT4DIR=$srcdir/$_pkgfqn
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # some of those are likely unnecessary, but I'm too lazy to find and remove them
-  sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf
-  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf
-  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/gcc-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS} -m32|g" mkspecs/common/gcc-base.conf
-  sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf
-  sed -e "s|-O2|$CXXFLAGS -m32|" \
-      -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
-      -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \
-      -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
-      -i mkspecs/common/g++.conf
-
-  ./configure -confirm-license -opensource -v -platform linux-g++-32 \
-    -prefix /usr \
-    -libdir /usr/lib32 \
-    -plugindir /usr/lib32/qt/plugins \
-    -importdir /usr/lib32/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -graphicssystem raster \
-    -openssl-linked \
-    -nomake demos \
-    -nomake examples \
-    -nomake docs \
-    -nomake tools \
-    -optimized-qmake \
-    -no-rpath \
-    -dbus-linked \
-    -reduce-relocations \
-    -no-openvg
-
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgfqn
-  make INSTALL_ROOT=$pkgdir install
-
-  # Fix wrong path in pkgconfig files
-  find ${pkgdir}/usr/lib32/pkgconfig -type f -name '*.pc' \
-    -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-  # Fix wrong path in prl files
-  find ${pkgdir}/usr/lib32 -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-staging/libtool-multilib/PKGBUILD b/multilib-staging/libtool-multilib/PKGBUILD
deleted file mode 100644
index abdc50ebc..000000000
--- a/multilib-staging/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 62034 2012-01-14 22:04:47Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuild with each new gcc version
-
-pkgbase=libtool-multilib
-pkgname=(libtool-multilib lib32-libltdl)
-pkgver=2.4.2
-pkgrel=2.1
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.6.2
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd "$srcdir"
-
-  rm -rf libtool-64 libtool-32
-  mv libtool-$pkgver libtool-64
-  cp -a libtool-64 libtool-32
-
-  msg2 "Building libtool-64..."
-  cd "$srcdir/libtool-64"
-  ./configure --prefix=/usr
-  make
-
-  msg2 "Building libtool-32..."
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-
-  cd "$srcdir/libtool-32"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-check() {
-  cd "$srcdir/libtool-64"
-  make check
-  cd "$srcdir/libtool-32"
-  make check
-}
-
-package_libtool-multilib() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
-  groups=('multilib-devel')
-  install=libtool.install
-  provides=("libtool=$pkgver-$pkgrel")
-  conflicts=(libtool)
-
-  cd "$srcdir/libtool-64"
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_lib32-libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
-  depends=(lib32-glibc libltdl)
-  replaces=(lib32-libtool)
-  provides=("lib32-libtool=$pkgver-$pkgrel")
-  conflicts=(lib32-libtool)
-
-  cd "$srcdir/libtool-32"
-  make DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
diff --git a/multilib-staging/libtool-multilib/libtool.install b/multilib-staging/libtool-multilib/libtool.install
deleted file mode 100644
index 424c8cb88..000000000
--- a/multilib-staging/libtool-multilib/libtool.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-staging/wine/PKGBUILD b/multilib-staging/wine/PKGBUILD
deleted file mode 100644
index ea98cf97f..000000000
--- a/multilib-staging/wine/PKGBUILD
+++ /dev/null
@@ -1,147 +0,0 @@
-# $Id: PKGBUILD 62541 2012-01-20 19:26:11Z bluewind $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=wine
-pkgver=1.3.37
-pkgrel=2
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('4bf25be22c130765283d9953d03b65c4')
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-license=(LGPL)
-install=wine.install
-
-depends=(
-  fontconfig      lib32-fontconfig
-  mesa            lib32-mesa 
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  gnutls          lib32-gnutls
-  libxinerama     lib32-libxinerama
-  libxcomposite   lib32-libxcomposite
-  libxmu          lib32-libxmu
-  libxxf86vm      lib32-libxxf86vm
-  libxml2         lib32-libxml2
-  libldap         lib32-libldap
-  lcms            lib32-lcms
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  alsa-lib        lib32-alsa-lib
-  oss
-)
-  
-optdepends=(
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  libldap         lib32-libldap
-  gnutls          lib32-gnutls
-  lcms            lib32-lcms
-  libxml2         lib32-libxml2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  oss             cups
-)
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-else
-  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts=('bin32-wine' 'wine-wow64')
-  replaces=('bin32-wine')
-fi
-
-build() {
-  cd "$srcdir"
-
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build
-
-  # These additional CFLAGS solve FS#27662
-  export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-  export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
-
-    mkdir $pkgname-64-build
-    cd "$srcdir/$pkgname-64-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --libdir=/usr/lib \
-      --with-x \
-      --enable-win64
-
-    make
-
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$pkgname-64-build"
-    )
-
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-x \
-    "${_wine32opts[@]}"
-
-  # These additional CFLAGS solve FS#27560
-  make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign"
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib32" \
-      dlldir="$pkgdir/usr/lib32/wine" install
-
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/multilib-staging/wine/wine.install b/multilib-staging/wine/wine.install
deleted file mode 100644
index 0548b7ffd..000000000
--- a/multilib-staging/wine/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
-	update-desktop-database -q
-}
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
deleted file mode 100644
index 6888c5181..000000000
--- a/multilib-testing/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 62099 2012-01-16 01:54:07Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils-multilib
-pkgver=2.22
-pkgrel=4.1
-_date=20111227
-pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('multilib-devel')
-provides=("binutils=$pkgver-$pkgrel")
-conflicts=('binutils')
-depends=('glibc>=2.14' 'zlib')
-makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared \
-    --enable-64-bit-bfd --enable-multilib
-
-  # check the host environment and makes sure all the necessary tools are available
-  make configure-host
-
-  make tooldir=${pkgdir}/usr
-
-  # Rebuild libiberty.a with -fPIC
-  cp -a libiberty libiberty-pic
-  make -C libiberty-pic clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
-  # Rebuild libbfd.a with -fPIC
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  cp -a bfd bfd-pic
-  make -C bfd-pic clean
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  make -k -j1 check || true
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
-  # install libraries rebuilt with -fPIC
-  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
-  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
-
-  # Remove Windows/Novell specific man pages
-  rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
-  # Remove these symlinks, they are not ABI stable.
-  # Programs should compile static to the .a file.
-  rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
-  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
-  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib-testing/binutils-multilib/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/multilib-testing/chuck/PKGBUILD b/multilib-testing/chuck/PKGBUILD
deleted file mode 100644
index 2250f2e39..000000000
--- a/multilib-testing/chuck/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62100 2012-01-16 01:54:11Z heftig $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-
-pkgname=chuck
-pkgver=1.2.1.3
-pkgrel=5.1
-pkgdesc="Concurrent, on-the-fly audio programming language."
-arch=('i686' 'x86_64')
-url="http://chuck.cs.princeton.edu/"
-license=('GPL')
-depends=('gcc-libs' 'libsndfile' 'alsa-lib')
-makedepends=('bison' 'flex')
-source=(http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz)
-md5sums=('ac8459b4067c2491fbdeb61d122a5985')
-
-if [[ $CARCH == x86_64 ]]; then
-	depends=('lib32-gcc-libs' 'lib32-libsndfile' 'lib32-alsa-lib')
-	makedepends+=('gcc-multilib')
-fi
-
-build() {
-	if [[ $CARCH == x86_64 ]]; then
-		export CC='gcc -m32'
-		export CXX='g++ -m32'
-		export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-	fi
-
-	cd $srcdir/$pkgname-$pkgver/src
-	CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-	# This can be linux-alsa linux-jack linux-oss osx win32
-	make linux-alsa
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver/src
-	install -D -m 755 chuck $pkgdir/usr/bin/chuck
-}
diff --git a/multilib-testing/dev86/PKGBUILD b/multilib-testing/dev86/PKGBUILD
deleted file mode 100644
index bde7ba3be..000000000
--- a/multilib-testing/dev86/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 59310 2011-11-23 10:19:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-# Contributor: Suat SARIALP <muhendis.suat@gmail.com>
-
-pkgname=dev86
-pkgver=0.16.18
-pkgrel=3
-pkgdesc="Simple C compiler to generate 8086 code"
-arch=('i686' 'x86_64')
-url="http://www.debath.co.uk/dev86/"
-license=(GPL)
-if [ "${CARCH}" == "x86_64" ]; then
-  depends=('lib32-glibc')
-  makedepends=('bin86' 'gcc-multilib')
-else
-  makedepends=('bin86')
-fi
-options=('!libtool' '!strip' '!makeflags')
-source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz
-	dev86-pic.patch
-	dev86-0.16.17-fortify.patch)
-md5sums=('f2e06b547397383b2b2650b9c4fd9bab'
-         '1b750c5561a4bde5f83f65e5827feb73'
-         '07238f9203c6528ea1e34198e771ea12')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i $srcdir/dev86-pic.patch
-  patch -Np1 -i $srcdir/dev86-0.16.17-fortify.patch
-  if [ "${CARCH}" = "x86_64" ]; then
-    # x86_64 fix
-    sed -i.orig -e 's,alt-libs elksemu,alt-libs,' \
-		-e 's,install-lib install-emu,install-lib,' \
-		$srcdir/$pkgname-$pkgver/makefile.in
-    sed -i -e "s/-O2 -g/-O2 -g -m32/" makefile.in
-    sed -i 's|^LDFLAGS.*=$|LDFLAGS=-m32|' makefile.in
-  fi
-
-  unset CFLAGS
-  unset LDFLAGS
-  unset CPPFLAGS
-  unset CXXFLAGS
-
-  make PREFIX=/usr DIST="$pkgdir"
-  make install-all DIST="$pkgdir"
-  mkdir -p $pkgdir/usr/share
-  mv $pkgdir/usr/man $pkgdir/usr/share
-  # remove all the stuff supplied by bin86
-  rm $pkgdir/usr/bin/{as,ld,nm,objdump,size}86
-  rm $pkgdir/usr/share/man/man1/{as,ld}86.1
-}
diff --git a/multilib-testing/dev86/dev86-0.16.17-fortify.patch b/multilib-testing/dev86/dev86-0.16.17-fortify.patch
deleted file mode 100644
index 715d0c4ca..000000000
--- a/multilib-testing/dev86/dev86-0.16.17-fortify.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- dev86-0.16.17/bcc/bcc.c
-+++ dev86-0.16.17/bcc/bcc.c
-@@ -19,6 +19,7 @@
- #ifdef __STDC__
- #include <stdlib.h>
- #ifndef MSDOS
-+#include <limits.h>
- #include <unistd.h>
- #endif
- #else
-@@ -596,12 +597,17 @@
-    }
- }
- 
--void
--command_reset()
--{
- #ifndef MAXPATHLEN
-+#ifdef PATH_MAX
-+#define MAXPATHLEN PATH_MAX
-+#else
- #define MAXPATHLEN 1024
- #endif
-+#endif
-+
-+void
-+command_reset()
-+{
-    char buf[MAXPATHLEN];
-    char ** prefix;
-    char * saved_cmd;
-@@ -1308,11 +1314,7 @@
- 
-       for(d=s=ptr; d && *s; s=d)
-       {
--#ifdef MAXPATHLEN
-          char buf[MAXPATHLEN];
--#else
--         char buf[1024];
--#endif
- 
- 	 free(temp);
-          d=strchr(s, ':');
diff --git a/multilib-testing/dev86/dev86-pic.patch b/multilib-testing/dev86/dev86-pic.patch
deleted file mode 100644
index 439c2648b..000000000
--- a/multilib-testing/dev86/dev86-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- elksemu/elks.c.orig	2005-11-04 01:35:37.000000000 +0100
-+++ elksemu/elks.c	2005-11-04 01:45:28.000000000 +0100
-@@ -129,8 +129,17 @@
- static inline int vm86_mine(struct vm86_struct* v86)
- {
- 	int __res;
-+#ifndef __PIC__
- 	__asm__ __volatile__("int $0x80\n"
- 	:"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
-+#else
-+	__asm__ __volatile__(
-+		"movl	%%ebx,%%ecx\n\t"
-+		"movl	%2,%%ebx\n\t"
-+		"int	$0x80\n\t"
-+		"movl	%%ecx,%%ebx\n\t"
-+		:"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
-+#endif
- 	return __res;
- } 
- #endif
diff --git a/multilib-testing/jack2-multilib/40-hpet-permissions.rules b/multilib-testing/jack2-multilib/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/multilib-testing/jack2-multilib/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/multilib-testing/jack2-multilib/99-audio.conf b/multilib-testing/jack2-multilib/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/multilib-testing/jack2-multilib/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/multilib-testing/jack2-multilib/PKGBUILD b/multilib-testing/jack2-multilib/PKGBUILD
deleted file mode 100644
index 6c45b64d6..000000000
--- a/multilib-testing/jack2-multilib/PKGBUILD
+++ /dev/null
@@ -1,143 +0,0 @@
-# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-# This one is in response to a need for an equivalent to lib32-jack for
-# jack2. A lib32-jack2 would require much patching and invading the pure
-# jack2 package, and what's more, the buildsystem provides a flag just to
-# build a hybrid jack2 in full. As such, we have opted to provide multilib
-# users with a replacement package instead of the usual lib32 add-on.
-#
-# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
-
-pkgbase=jack2-multilib
-pkgname=('jack2-multilib' 'jack2-dbus-multilib')
-#pkgname= # single build (overrides split)
-_tarname=jack
-pkgver=1.9.8
-pkgrel=1
-arch=('x86_64')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-license=('GPL')
-makedepends=('python2' 'doxygen' 'libffado'
-             'libsamplerate' 'lib32-dbus-core' 'lib32-celt'
-             'gcc-multilib')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
-        '99-audio.conf'
-        '40-hpet-permissions.rules')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef')
-
-_pyfix() {
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/jack_control"
-}
-
-_wafconf() {
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --firewire \
-                        --mixed \
-                        --doxygen $@
-}
-
-_isbuild() {
-  printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-_mklinks() {
-  ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0"
-  ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so"
-}
-
-build() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  export LINKFLAGS="$LDFLAGS"
-
-  # fix doxygen building
-  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
-
-  # we may do 2 different builds
-  cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
-
-  # mixed dbus/classic build
-  if _isbuild jack2-multilib; then
-    cd $_tarname-$pkgver
-    msg2 "Running Mixed D-Bus/Classic build"
-    _wafconf --classic --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-
-  # dbus-ONLY build
-  if _isbuild jack2-dbus-multilib; then
-    cd $_tarname-dbus-$pkgver
-    msg2 "Running D-Bus-only build"
-    _wafconf --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-}
-
-package_jack2-multilib() {
-  ! _isbuild jack2-multilib && return 0
-
-  pkgdesc="The next-generation JACK with SMP support & mixed mode"
-  depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs')
-  optdepends=('libffado: FireWire support'
-              'lib32-dbus-core: jackdbus'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2' 'lib32-jack')
-  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus'
-            'jack2' 'lib32-jack' 'lib32-jack2')
-
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-
-  # fix for major python transition
-  _pyfix
-
-  # configure realtime access/scheduling
-  # see https://bugs.archlinux.org/task/26343
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  # should be done by upstream
-  # see http://trac.jackaudio.org/ticket/200
-  _mklinks
-}
-
-package_jack2-dbus-multilib() {
-  ! _isbuild jack2-dbus-multilib && return 0
-
-  pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
-  depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs')
-  optdepends=('libffado: FireWire support'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
-  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus'
-            'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2')
-
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-
-  _pyfix
-
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  _mklinks
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD
deleted file mode 100644
index 3dce5033d..000000000
--- a/multilib-testing/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 62105 2012-01-16 01:54:43Z heftig $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.30.2
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0}
-}
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index a14489c72..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,186 +0,0 @@
-# $Id: PKGBUILD 62757 2012-01-26 04:37:18Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.15
-pkgrel=4
-_glibcdate=20111227
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.6')
-options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
-        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
-        glibc-__i686.patch
-        glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
-        glibc-2.14-reexport-rpc-interface.patch
-        glibc-2.14-reinstall-nis-rpc-headers.patch
-        glibc-2.15-regex.patch
-        glibc-2.15-lddebug-scopes.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.15-strcmp-disable-avx.patch
-        lib32-glibc.conf)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         'b3526cbd5e29773560dba725db99af5a'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         '7a44dd821835e4984aa75ad44fad3baf'
-         '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
-  cd ${srcdir}/glibc
-
-  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
-  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
-  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
-  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely:
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
-  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
-  # Fix up regcomp/regexec
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
-  patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
-
-  # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=769421
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # Disable AVX in strcmp as this breaks Xen
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13583
-  patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch
-
-  # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743)
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13618
-  rm sysdeps/x86_64/fpu/multiarch/*
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  export CC="gcc -m32"
-
-  # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-  export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
-  echo "slibdir=/usr/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --enable-multi-arch i686-unknown-linux-gnu
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "s#=no#=yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
-
-  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
-
-  # We need one 32 bit specific header file
-  find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
-  cd $pkgdir
-  strip $STRIP_BINARIES usr/lib32/getconf/*
-
-  strip $STRIP_STATIC usr/lib32/*.a
-
-  strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/lib
-  ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/
-
-  # Add lib32 paths to the default library search path
-  install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
-  # Symlink /usr/lib32/locale to /usr/lib/locale
-  ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-}
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.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }
--- 
-1.7.2
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- 
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/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-glibc/glibc-2.15-lddebug-scopes.patch b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	      char *copy = malloc (len);
- 	      if (copy == NULL)
- 		_dl_fatal_printf ("out of memory\n");
--	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+	      l->l_libname->name = memcpy (copy, dsoname, len);
-+	      if (GLRO(dl_debug_mask))
-+		l->l_name = copy;
- 	    }
- 
- 	  /* Add the vDSO to the object list.  */
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch b/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- 			s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
- 
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
--	.type	__ceil, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__ceil_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__ceil_c(%rip), %rax
--2:	ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
--	roundsd	$2, %xmm0, %xmm0
--	ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
--	.type	__floor, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__floor_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__floor_c(%rip), %rax
--2:	ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
--	roundsd	$1, %xmm0, %xmm0
--	ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __cos_fma4 ((void *) 0)
--#  define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-regex.patch b/multilib-testing/lib32-glibc/glibc-2.15-regex.patch
deleted file mode 100644
index 6385f2c08..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-regex.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/posix/regex_internal.c b/posix/regex_internal.c
-index bc19243..124f8cc 100644
---- a/posix/regex_internal.c
-+++ b/posix/regex_internal.c
-@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx)
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	18f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- 	movl	%ebp, %edx
- 	xorl	%esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- 	sete	16(%esp)
- 	je	19f
- 
--	cmpl	$-EAGAIN, %eax
--	je	91f
--
- 	/* Normal and PI futexes dont mix. Use normal futex functions only
- 	   if the kernel does not support the PI futex functions.  */
- 	cmpl	$-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- 	call	__lll_unlock_wake
- 	jmp	11b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--
--	/* Get internal lock.  */
--	movl	$1, %edx
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %edx, (%ebx)
--#else
--	cmpxchgl %edx, cond_lock(%ebx)
--#endif
--	jz	92f
--
--#if cond_lock == 0
--	movl	%ebx, %edx
--#else
--	leal	cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_lock_wait
--
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	addl	$1, cond_futex(%ebx)
--	movl	cond_futex(%ebx), %ebp
--
--	/* Unlock.  */
--	LOCK
--#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	je	93f
--#if cond_lock == 0
--	movl	%ebx, %eax
--#else
--	leal	cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_unlock_wake
--
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorl	%ecx, %ecx
--	movl	dep_mutex(%ebx), %edi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- 	.long	.LcleanupEND-.Lsub_cond_futex
- 	.long	__condvar_w_cleanup-.LSTARTCODE
- 	.uleb128  0
--	.long	.LcleanupSTART2-.LSTARTCODE
--	.long	.LcleanupEND2-.LcleanupSTART2
--	.long	__condvar_w_cleanup-.LSTARTCODE
--	.uleb128  0
- 	.long	.LcallUR-.LSTARTCODE
- 	.long	.LENDCODE-.LcallUR
- 	.long	0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- 
- #include <kernel-features.h>
- 
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	61f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- 	movl	$SYS_futex, %eax
- 	syscall
- 
- 	movl	$1, %r8d
--	cmpq	$-EAGAIN, %rax
--	je	91f
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
- 
- 13:	movq	%r10, %rax
- 	jmp	14b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--	movq	8(%rsp), %rdi
--
--	/* Get internal lock.  */
--	movl	$1, %esi
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %esi, (%rdi)
--#else
--	cmpxchgl %esi, cond_lock(%rdi)
--#endif
--	jz	92f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	cmpq	$-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	callq	__lll_lock_wait
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	incl	cond_futex(%rdi)
--	movl	cond_futex(%rdi), %edx
--
--	/* Release internal lock.  */
--	LOCK
--#if cond_lock == 0
--	decl	(%rdi)
--#else
--	decl	cond_lock(%rdi)
--#endif
--	jz	93f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	cmpq	$-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	/* The call preserves %rdx.  */
--	callq	__lll_unlock_wake
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorq	%r10, %r10
--	movq	dep_mutex(%rdi), %r8
--	leaq	cond_futex(%rdi), %rdi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupSTART-.LSTARTCODE
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
-+	.uleb128  0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
--	.uleb128 0
-+	.uleb128  0
- .Lcstend:
- 
- 
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch
deleted file mode 100644
index 7f1f5b8f2..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strcasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strncasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
- 
- 
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
- 	.type STRCMP_SSE2, @function; \
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib-testing/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think).  Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
- 
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index 9b08c3f43..000000000
--- a/multilib-testing/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib32
diff --git a/multilib-testing/lib32-gtk2/PKGBUILD b/multilib-testing/lib32-gtk2/PKGBUILD
deleted file mode 100644
index c941bab84..000000000
--- a/multilib-testing/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 62107 2012-01-16 01:55:04Z heftig $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=gtk2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.8
-pkgrel=2
-pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-install=gtk2.install
-depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gdk-pixbuf2>=2.22.1'}
-         lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage}
-         $_pkgbasename)
-makedepends=('pkgconfig' 'gcc-multilib')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch
-        gtk-modules-32.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-  patch -p1 -i ${srcdir}/gtk-modules-32.patch
-
-  CXX=/bin/false ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libdir=/usr/lib32 \
-      --with-xinput=yes
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd "${srcdir}/gtk+-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32
-  rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache
-}
diff --git a/multilib-testing/lib32-gtk2/gtk-modules-32.patch b/multilib-testing/lib32-gtk2/gtk-modules-32.patch
deleted file mode 100644
index a2530c3bf..000000000
--- a/multilib-testing/lib32-gtk2/gtk-modules-32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c
---- gtk+-2.20.1/gtk/gtkrc.c	2010-05-03 01:28:21.000000000 +0200
-+++ gtk+-2.20.1-32/gtk/gtkrc.c	2010-08-26 07:22:42.316920033 +0200
-@@ -450,7 +450,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL);
-     }
- 
-   return result;
diff --git a/multilib-testing/lib32-gtk2/gtk2.install b/multilib-testing/lib32-gtk2/gtk2.install
deleted file mode 100644
index 49f86f550..000000000
--- a/multilib-testing/lib32-gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null
-}
diff --git a/multilib-testing/lib32-gtk2/xid-collision-debug.patch b/multilib-testing/lib32-gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/multilib-testing/lib32-gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
deleted file mode 100644
index d5c5c69f7..000000000
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 61806 2012-01-07 23:05:50Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.30
-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)
-md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
-         '0c423f6f886a3a8d6a8834224de95bcf')
-
-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 6ad4a48ee..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)
--
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
-	@PCIACCESS_LIBS@ \
-	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/multilib-testing/lib32-libpulse/PKGBUILD b/multilib-testing/lib32-libpulse/PKGBUILD
deleted file mode 100644
index dc5875fc0..000000000
--- a/multilib-testing/lib32-libpulse/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 61429 2011-12-31 00:45:02Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-_pkgbasename=libpulse
-pkgname=lib32-$_pkgbasename
-pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)"
-pkgver=1.1
-pkgrel=2
-arch=(x86_64)
-url="http://pulseaudio.org/"
-license=(GPL LGPL)
-depends=(lib32-dbus-core lib32-json-c 
-         lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile
-         $_pkgbasename)
-makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex lib32-gtk2)
-optdepends=('lib32-alsa-plugins: ALSA support')
-provides=("lib32-pulseaudio=$pkgver")
-conflicts=(lib32-pulseaudio)
-replaces=(lib32-pulseaudio)
-options=(!emptydirs !libtool)
-source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz")
-sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee')
-
-_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la"
-
-build() {
-  cd "$srcdir/pulseaudio-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib32 \
-    --libexecdir=/usr/lib32 \
-    --localstatedir=/var \
-    --disable-hal \
-    --disable-tcpwrap \
-    --disable-rpath \
-    --disable-default-build-tests
-
-  # fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make -C src $_libs
-}
-
-package() {
-  cd "$srcdir/pulseaudio-$pkgver"
-  make -j1 -C src DESTDIR="$pkgdir" \
-    lib_LTLIBRARIES="$_libs" install-libLTLIBRARIES
-  make -j1 DESTDIR="$pkgdir" install-pkgconfigDATA
-}
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
deleted file mode 100644
index 42d8435a5..000000000
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62186 2012-01-17 19:44:58Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.8
-pkgrel=1
-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-udev/PKGBUILD b/multilib-testing/lib32-udev/PKGBUILD
deleted file mode 100644
index 6b91c7ba3..000000000
--- a/multilib-testing/lib32-udev/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62945 2012-01-29 12:24:25Z lcarlier $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=('lib32-udev')
-pkgver=180
-pkgrel=1
-arch=('x86_64')
-pkgdesc="The userspace dev tools (udev) (32-bit)"
-url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license=('GPL')
-options=(!makeflags !libtool)
-depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev')
-makedepends=('gcc-multilib' 'gperf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz)
-md5sums=('1cf124ab5a124ea35d4748ea414926ec')
-
-build() {
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/udev-$pkgver
-
-  ./configure --libdir=/usr/lib32 --disable-introspection
-  make
-}
-  
-package() {
-  
-  cd $srcdir/udev-$pkgver
-
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share}
-  rm -rf ${pkgdir}/usr/lib32/girepository*
-}
diff --git a/multilib-testing/lib32-zlib/PKGBUILD b/multilib-testing/lib32-zlib/PKGBUILD
deleted file mode 100644
index 0233e90ab..000000000
--- a/multilib-testing/lib32-zlib/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 63029 2012-01-30 16:33:32Z pschmitz $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=zlib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.6
-pkgrel=1
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
-arch=('x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('618e944d7c7cd6521551e30b32322f4a')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr \
-		--libdir=/usr/lib32
-	make
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test -j 1
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-
-	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/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
deleted file mode 100644
index 54b26abc4..000000000
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 62110 2012-01-16 01:55:19Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuild with each new gcc version
-
-pkgbase=libtool-multilib
-pkgname=(libtool-multilib lib32-libltdl)
-pkgver=2.4.2
-pkgrel=2.1
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.6.2
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd "$srcdir"
-
-  rm -rf libtool-64 libtool-32
-  mv libtool-$pkgver libtool-64
-  cp -a libtool-64 libtool-32
-
-  msg2 "Building libtool-64..."
-  cd "$srcdir/libtool-64"
-  ./configure --prefix=/usr
-  make
-
-  msg2 "Building libtool-32..."
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-
-  cd "$srcdir/libtool-32"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-check() {
-  cd "$srcdir/libtool-64"
-  make check
-  cd "$srcdir/libtool-32"
-  make check
-}
-
-package_libtool-multilib() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
-  groups=('multilib-devel')
-  install=libtool.install
-  provides=("libtool=$pkgver-$pkgrel")
-  conflicts=(libtool)
-
-  cd "$srcdir/libtool-64"
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_lib32-libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
-  depends=(lib32-glibc libltdl)
-  replaces=(lib32-libtool)
-  provides=("lib32-libtool=$pkgver-$pkgrel")
-  conflicts=(lib32-libtool)
-
-  cd "$srcdir/libtool-32"
-  make DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
diff --git a/multilib-testing/libtool-multilib/libtool.install b/multilib-testing/libtool-multilib/libtool.install
deleted file mode 100644
index 424c8cb88..000000000
--- a/multilib-testing/libtool-multilib/libtool.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/nspluginwrapper/PKGBUILD b/multilib-testing/nspluginwrapper/PKGBUILD
deleted file mode 100644
index 7e88d8712..000000000
--- a/multilib-testing/nspluginwrapper/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 62111 2012-01-16 01:55:23Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=nspluginwrapper
-pkgver=1.4.4
-pkgrel=2.1
-pkgdesc="Cross-platform NPAPI compatible plugin viewer"
-arch=('i686' 'x86_64')
-url="http://nspluginwrapper.davidben.net/"
-license=('GPL')
-depends=(
-  'curl'
-  'libxt' 'lib32-libxt'
-  'gcc-libs' 'lib32-gcc-libs'
-  'gtk2' 'lib32-gtk2'
-)
-makedepends=('gcc-multilib')
-install="install"
-source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
-        'fix_missing_lib.patch')
-md5sums=('36f3e290fc4ce56f65ee695078961188'
-         'd40ad2f55d9989e04e3ef0cf4326b1df')
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-fi
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p0 -i "$srcdir/fix_missing_lib.patch"
-
-  configure_args=""
-  if [[ $CARCH == x86_64 ]]; then
-    configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib"
-  fi
-
-  ./configure $configure_args
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/nspluginwrapper/fix_missing_lib.patch b/multilib-testing/nspluginwrapper/fix_missing_lib.patch
deleted file mode 100644
index f239053f1..000000000
--- a/multilib-testing/nspluginwrapper/fix_missing_lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2012-01-15 13:25:28.922775770 +0100
-+++ Makefile.new	2012-01-15 13:25:09.185815643 +0100
-@@ -142,7 +142,7 @@
- npplayer_LDFLAGS  = $(LDFLAGS)
- npplayer_LDFLAGS += $(libpthread_LDFLAGS)
- npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS)
--npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS)
-+npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS) -ldl
- 
- libnoxshm_LIBRARY = libnoxshm.so
- libnoxshm_RAWSRCS = libnoxshm.c
diff --git a/multilib-testing/nspluginwrapper/install b/multilib-testing/nspluginwrapper/install
deleted file mode 100644
index 78e196fdb..000000000
--- a/multilib-testing/nspluginwrapper/install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  for i in `nspluginwrapper -l | grep -v "^ "`; do
-    /usr/bin/nspluginwrapper -u "$i"
-  done
-}
diff --git a/multilib-testing/q4wine/PKGBUILD b/multilib-testing/q4wine/PKGBUILD
deleted file mode 100644
index 6bcafffa1..000000000
--- a/multilib-testing/q4wine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62112 2012-01-16 01:55:29Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
-
-pkgname=q4wine
-pkgver=0.121
-pkgrel=3
-pkgdesc="A Qt4 GUI for Wine"
-arch=("i686" "x86_64")
-url="http://sourceforge.net/projects/${pkgname}/"
-license=("GPL3")
-depends=("qt" "wine" "sqlite3" "which" "icoutils")
-makedepends=("cmake")
-optdepends=("winetricks" "fuseiso")
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2)
-md5sums=('2de5de62f57ba6b26247198df339d81a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_WINETRIKS=ON \
-    -DLIBS_ENTRY_PATH=/usr/lib/$pkgname .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/multilib-testing/q4wine/q4wine.desktop b/multilib-testing/q4wine/q4wine.desktop
deleted file mode 100644
index 2b1415848..000000000
--- a/multilib-testing/q4wine/q4wine.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Q4Wine
-GenericName=A Qt4 GUI for Wine
-Comment=A Qt4 GUI for Wine
-#Version=0.1
-Type=Application
-Categories=KDE;Qt;Settings
-Terminal=false
-Encoding=UTF-8
-Icon=wine
-Exec=q4wine
-#ServiceTypes=inode/directory
-#Actions=Create;
-#X-KDE-Submenu=
-#X-KDE-Priority=TopLevel
-#X-KDE-Icon=tgz
-X-KDE-StartupNotify=true
-#X-DCOP-ServiceType=Unique
diff --git a/multilib/gcc-multilib/gcc_pure64.patch b/multilib/gcc-multilib/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/multilib/gcc-multilib/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib/lib32-glibc/glibc-2.15-math64crash.patch b/multilib/lib32-glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/multilib/lib32-glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- 			s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
- 
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
--	.type	__ceil, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__ceil_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__ceil_c(%rip), %rax
--2:	ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
--	roundsd	$2, %xmm0, %xmm0
--	ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
--	.type	__floor, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__floor_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__floor_c(%rip), %rax
--2:	ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
--	roundsd	$1, %xmm0, %xmm0
--	ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __cos_fma4 ((void *) 0)
--#  define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/multilib/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch b/multilib/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch
deleted file mode 100644
index fcd3c314d..000000000
--- a/multilib/lib32-sdl/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/multilib/lib32-sdl/sdl-1.2.14-joystick-crash.diff b/multilib/lib32-sdl/sdl-1.2.14-joystick-crash.diff
deleted file mode 100644
index 949e18b96..000000000
--- a/multilib/lib32-sdl/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/multilib/lib32-zlib/zlib-1.2.5-lfs-decls.patch b/multilib/lib32-zlib/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644
index 36e26af03..000000000
--- a/multilib/lib32-zlib/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zlib-1.2.5/zlib.h
-===================================================================
---- zlib-1.2.5.orig/zlib.h
-+++ zlib-1.2.5/zlib.h
-@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
- #  define gzoffset gzoffset64
- #  define adler32_combine adler32_combine64
- #  define crc32_combine crc32_combine64
--#  ifdef _LARGEFILE64_SOURCE
-+#  ifndef _LARGEFILE64_SOURCE
-      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/staging/abiword/PKGBUILD b/staging/abiword/PKGBUILD
deleted file mode 100644
index 68ff94733..000000000
--- a/staging/abiword/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 146946 2012-01-19 14:59:03Z giovanni $
-# 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/staging/abiword/abiword-2.8.6-libpng15.patch b/staging/abiword/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c83..000000000
--- a/staging/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/staging/abiword/abiword-2.8.6-no-undefined.patch b/staging/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/staging/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/staging/abiword/abiword.install b/staging/abiword/abiword.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/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/staging/abiword/compat_libwpg_0_9.patch b/staging/abiword/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/staging/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/staging/allegro/PKGBUILD b/staging/allegro/PKGBUILD
deleted file mode 100644
index 3533ac18d..000000000
--- a/staging/allegro/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 146877 2012-01-19 02:37:38Z eric $
-# 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/staging/alsaplayer/PKGBUILD b/staging/alsaplayer/PKGBUILD
deleted file mode 100644
index d723ee447..000000000
--- a/staging/alsaplayer/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 146875 2012-01-19 02:21:54Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=alsaplayer
-pkgver=0.99.81
-pkgrel=3
-pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
-arch=('i686' 'x86_64')
-url="http://www.alsaplayer.org/"
-license=('GPL')
-depends=('gcc-libs' 'desktop-file-utils')
-makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen')
-optdepends=('gtk2: for the gtk2 GUI interface' \
-            'libgl: for the OpenGL visual plugins' \
-            'jack: for JACK audio server output support' \
-            'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \
-            'libid3tag: for flac support' \
-            'flac: for flac support' \
-            'libmad: for MPEG support' \
-            'libsndfile: for sndfile support' \
-            'libvorbis: for ogg vorbis support' \
-            'libmikmod: for mod, s3m, it and xm formats supports')
-options=('!libtool')
-install=alsaplayer.install
-source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-audiofile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/alsaplayer/alsaplayer.install b/staging/alsaplayer/alsaplayer.install
deleted file mode 100644
index e111ef946..000000000
--- a/staging/alsaplayer/alsaplayer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/amule/PKGBUILD b/staging/amule/PKGBUILD
deleted file mode 100644
index 22280b542..000000000
--- a/staging/amule/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 146942 2012-01-19 13:36:15Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Henrik Ronellenfitsch <searinox@web.de>
-# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
-# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
-
-pkgname=amule
-pkgver=10708
-pkgrel=2
-pkgdesc="An eMule-like client for ed2k p2p network"
-arch=('i686' 'x86_64')
-url="http://www.amule.org"
-license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3')
-
-build() {
-  cd "${srcdir}/aMule-SVN-r${pkgver}"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --enable-cas \
-              --enable-wxcas \
-              --enable-amule-daemon \
-              --enable-amulecmd \
-              --enable-amule-gui \
-              --enable-alc \
-              --enable-alcc \
-              --enable-webserver \
-              --disable-debug \
-              --enable-optimize \
-              --enable-ccache \
-              --enable-geoip \
-              --enable-upnp
-
-  make
-}
-
-package() {
-  cd "${srcdir}/aMule-SVN-r${pkgver}"
-
-  make DESTDIR=${pkgdir}/ install
-}
diff --git a/staging/apr-util/PKGBUILD b/staging/apr-util/PKGBUILD
deleted file mode 100644
index c5f9410df..000000000
--- a/staging/apr-util/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145823 2012-01-02 11:42:51Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apr-util
-pkgver=1.3.12
-pkgrel=5
-pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
-url="http://apr.apache.org/"
-depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
-options=('!libtool')
-license=('APACHE')
-source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('0f671b037ca62751a8a7005578085560')
-
-build() {
-  cd "${srcdir}/apr-util-${pkgver}"
-  ./configure --prefix=/usr --with-apr=/usr \
-    --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
-    --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
-  make
-}
-
-package() {
-  cd "${srcdir}/apr-util-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/at-spi/PKGBUILD b/staging/at-spi/PKGBUILD
deleted file mode 100644
index 8cb6c20e9..000000000
--- a/staging/at-spi/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 147108 2012-01-22 10:16:03Z andyrtr $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=at-spi
-pkgver=1.32.0
-pkgrel=5
-pkgdesc="Assistive Technology Service Provider Interface"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libbonobo' 'libxtst' 'gtk2' 'gconf')
-makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=at-spi.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039')
-
-# !! make sure you 'pacman -Rsc python' from your chroot before building the package or it would use python3 instead of the wanted python2 !!
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/at-spi \
-      --enable-relocate
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/at-spi/at-spi.install b/staging/at-spi/at-spi.install
deleted file mode 100644
index b4c75b51c..000000000
--- a/staging/at-spi/at-spi.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=at-spi
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/staging/autopano-sift-c/PKGBUILD b/staging/autopano-sift-c/PKGBUILD
deleted file mode 100644
index 35f76e38a..000000000
--- a/staging/autopano-sift-c/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146969 2012-01-19 19:16:11Z eric $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=autopano-sift-c
-pkgver=2.5.1
-pkgrel=3
-pkgdesc="Identify key feature points within arbitrary images"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('GPL2')
-depends=('libxml2' 'libpano13' 'gcc-libs')
-makedepends=('cmake')
-provides=('autopano-sift')
-conflicts=('autopano-sift')
-replaces=('autopano-sift')
-source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz)
-md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
-
-build() {
-  cd "${srcdir}/autopano-sift-C-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
-  make
-}
-
-package() {
-  cd "${srcdir}/autopano-sift-C-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/avahi/PKGBUILD b/staging/avahi/PKGBUILD
deleted file mode 100644
index b917e9248..000000000
--- a/staging/avahi/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 147194 2012-01-24 04:55:03Z bisson $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.30
-pkgrel=7
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
-url='http://www.avahi.org/'
-license=('LGPL')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
-            'qt3: qt3 bindings'
-            'qt: qt bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
-            'twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'dbus-python: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'gnome-nettool.png'
-        'rc.d.patch')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
-          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i "../rc.d.patch"
-
-	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
-	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-		./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-xmltoman \
-		--enable-compat-libdns_sd \
-		--enable-compat-howl \
-		--with-distro=archlinux \
-		--with-avahi-priv-access-group=network \
-		--with-autoipd-user=avahi \
-		--with-autoipd-group=avahi \
-		--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
-
-	cd "${pkgdir}"
-	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
-	# howl and mdnsresponder compatability
-	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
-	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
-}
diff --git a/staging/avahi/gnome-nettool.png b/staging/avahi/gnome-nettool.png
deleted file mode 100644
index 227d0678a..000000000
--- a/staging/avahi/gnome-nettool.png
+++ /dev/null
diff --git a/staging/avahi/install b/staging/avahi/install
deleted file mode 100644
index 7c75c3dd4..000000000
--- a/staging/avahi/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-  getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
-  cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==>               dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
-}
-
-post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
-}
diff --git a/staging/avahi/rc.d.patch b/staging/avahi/rc.d.patch
deleted file mode 100644
index fd735734b..000000000
--- a/staging/avahi/rc.d.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
-+++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
-@@ -33,6 +33,7 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then
diff --git a/staging/bmp/0.9.7.1-visualization.patch b/staging/bmp/0.9.7.1-visualization.patch
deleted file mode 100644
index ac03323f6..000000000
--- a/staging/bmp/0.9.7.1-visualization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- beep/vis.c	2004-12-04 10:04:29.000000000 +0100
-+++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
-@@ -223,7 +223,8 @@ vis_draw(Widget * w)
-     /* FIXME: The check "shouldn't" be neccessary? */
-     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
-     GDK_THREADS_ENTER();
--    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-+    if (GDK_IS_DRAWABLE(vis->vs_window))
-+        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-                            vis->vs_widget.x, vis->vs_widget.y,
-                            vis->vs_widget.width, vis->vs_widget.height,
-                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
diff --git a/staging/bmp/PKGBUILD b/staging/bmp/PKGBUILD
deleted file mode 100644
index 028372325..000000000
--- a/staging/bmp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147143 2012-01-23 05:18:22Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=bmp
-pkgver=0.9.7.1
-pkgrel=9
-pkgdesc="gtk2 port of xmms"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/beepmp/"
-license=('GPL')
-depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
-makedepends=('libxt')
-options=('!libtool')
-install=bmp.install
-source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \
-        ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
-md5sums=('c25d5a8d49cc5851d13d525a20023c4c'
-         'fa1bdf5a8d03e8539a6bed5caa471176'
-         '42ad4109ddb66024d4c6d1f3e572ab86')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../${pkgver}-visualization.patch 
-  patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
-  LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man 
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
deleted file mode 100644
index 4c1e46da9..000000000
--- a/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Patch taken from xmms-crossfade 3.10 tarball.  Required for crossfade to
-work.  http://www.eisenlohr.org/xmms-crossfade/
-
-diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c
---- bmp-0.9.7.1/beep/mainwin.c	2005-05-09 10:45:39.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/mainwin.c	2005-11-25 00:03:59.000000000 +0100
-@@ -655,9 +655,11 @@
-     mainwin_set_shade(!cfg.player_shaded);
- }
- 
-+gboolean is_quitting = FALSE;
- void
- mainwin_quit_cb(void)
- {
-+    is_quitting = TRUE;
-     gtk_widget_hide(equalizerwin);
-     gtk_widget_hide(playlistwin);
-     gtk_widget_hide(mainwin);
-@@ -1318,7 +1320,7 @@
- change_song(guint pos)
- {
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     playlist_set_position(pos);
-     bmp_playback_initiate();
-diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c
---- bmp-0.9.7.1/beep/playback.c	2005-01-26 06:56:15.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.c	2005-11-25 00:03:59.000000000 +0100
-@@ -89,7 +89,7 @@
-         return;
- 
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     vis_clear_data(mainwin_vis);
-     vis_clear_data(playlistwin_vis);
-@@ -135,6 +135,15 @@
-     get_current_input_plugin()->pause(ip_data.paused);
- }
- 
-+gboolean input_stopped_for_restart = FALSE;
-+void
-+bmp_playback_stop_for_restart(void)
-+{
-+	input_stopped_for_restart = TRUE;
-+	bmp_playback_stop();
-+	input_stopped_for_restart = FALSE;
-+}
-+
- void
- bmp_playback_stop(void)
- {
-diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h
---- bmp-0.9.7.1/beep/playback.h	2004-12-04 10:04:26.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.h	2005-11-25 00:03:59.000000000 +0100
-@@ -26,6 +26,7 @@
- void bmp_playback_initiate(void);
- void bmp_playback_pause(void);
- void bmp_playback_stop(void);
-+void bmp_playback_stop_for_restart(void);
- gboolean bmp_playback_play_file(const gchar * filename);
- gboolean bmp_playback_get_playing(void);
- gboolean bmp_playback_get_paused(void);
-diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c
---- bmp-0.9.7.1/beep/playlist.c	2005-08-11 09:25:51.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/playlist.c	2005-11-25 00:03:59.000000000 +0100
-@@ -817,7 +817,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -868,7 +868,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1018,7 +1018,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1047,7 +1047,10 @@
- {
-     GList *plist_pos_list;
- 
--    bmp_playback_stop();
-+    if (cfg.repeat)
-+        bmp_playback_stop_for_restart();
-+    else
-+        bmp_playback_stop();
- 
-     PLAYLIST_LOCK();
-     plist_pos_list = find_playlist_position_list();
diff --git a/staging/bmp/bmp.install b/staging/bmp/bmp.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/bmp/bmp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/bogofilter/PKGBUILD b/staging/bogofilter/PKGBUILD
deleted file mode 100644
index 12b842168..000000000
--- a/staging/bogofilter/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 145934 2012-01-04 12:24:40Z pierre $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
-
-pkgname=bogofilter
-pkgver=1.2.2
-pkgrel=4
-pkgdesc="A fast Bayesian spam filtering tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://bogofilter.sourceforge.net"
-depends=('db' 'perl' 'gsl')
-backup=('etc/bogofilter/bogofilter.cf')
-source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/bogofilter  \
-              --localstatedir=/var \
-              --enable-transactions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
-
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
-  install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
-}
diff --git a/staging/cairo/PKGBUILD b/staging/cairo/PKGBUILD
deleted file mode 100644
index 37aac6a2f..000000000
--- a/staging/cairo/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 146832 2012-01-18 20:00:38Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=cairo
-pkgver=1.10.2
-pkgrel=3
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
-options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-tee
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/cairo/cairo-1.10.0-buggy_gradients.patch b/staging/cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/staging/cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

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

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

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

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

-      */

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

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/staging/cairomm/PKGBUILD b/staging/cairomm/PKGBUILD
deleted file mode 100644
index d8c952616..000000000
--- a/staging/cairomm/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147110 2012-01-22 10:23:49Z andyrtr $
-# Maintainer: Kevin <kevin@archlinux.org>
-# Contributor: criminy <criminy@gmail.com>
-
-pkgname=cairomm
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="C++ bindings to Cairo vector graphics library"
-arch=('i686' 'x86_64')
-url="http://www.cairographics.org"
-license=('LGPL' 'MPL')
-depends=('cairo' 'libsigc++')
-makedepends=('pkgconfig')
-source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool' '!emptydirs')
-sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/capi4hylafax/PKGBUILD b/staging/capi4hylafax/PKGBUILD
deleted file mode 100644
index 5f5adc139..000000000
--- a/staging/capi4hylafax/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 147956 2012-01-29 03:57:58Z eric $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=capi4hylafax
-pkgver=010300
-pkgrel=5
-pkgdesc="capi plugin for hylafax to enable isdn faxing"
-arch=(i686 x86_64)
-url="ftp://ftp.avm.de/tools"
-license=('GPL')
-depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
-source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
-	config.faxCAPI capi4hylafax.rc)
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
-         '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07')
-install=capi4hylafax.install
-backup=(var/spool/hylafax/etc/config.faxCAPI)
-
-build() {
-  cd "$srcdir"/$pkgname-01.03.00
-# fix config file
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
-  autoreconf --force --install
-  ./configure
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-01.03.00
-  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
-  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
-  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
-  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
-# adding FIFO
-  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-# fix /var/spool/hylafax permission
-  chown 10 "$pkgdir"/var/spool/hylafax
-  chgrp 14 "$pkgdir"/var/spool/hylafax
-# adding udev rule
-  mkdir -p "$pkgdir"/lib/udev/rules.d
-cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
-# CAPI devices
-SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
-SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
-
-EOF
-# fix c2faxadd
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
-  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
-}
diff --git a/staging/capi4hylafax/capi4hylafax.install b/staging/capi4hylafax/capi4hylafax.install
deleted file mode 100644
index 20c2d8f63..000000000
--- a/staging/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/staging/capi4hylafax/capi4hylafax.rc b/staging/capi4hylafax/capi4hylafax.rc
deleted file mode 100755
index 51025b020..000000000
--- a/staging/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/staging/capi4hylafax/config.faxCAPI b/staging/capi4hylafax/config.faxCAPI
deleted file mode 100644
index b2137757a..000000000
--- a/staging/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/staging/celestia/PKGBUILD b/staging/celestia/PKGBUILD
deleted file mode 100644
index 495903615..000000000
--- a/staging/celestia/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 146981 2012-01-19 21:57:20Z giovanni $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=celestia
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="Real-time space simulation"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
-        'celestia-1.6.1-gcc46.patch' 
-        'celestia-1.6.1-libpng15.patch'
-        'celestia-1.6.1-linking.patch')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-          '7c08ca391603806d788cb8f3342acedafc924eef'
-          '46ecc4e10b24191384bc848c206652498843adf0'
-          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    # build patch
-    patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
-    patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
-    patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
-
-    # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
-    export CFLAGS="$CFLAGS -fsigned-char"
-    export CXXFLAGS="$CXXFLAGS -fsigned-char"
-
-    autoreconf
-    ./configure --prefix=/usr \
-                --with-lua=/usr \
-		--datadir=/usr/share \
-                --with-gtk \
-                --disable-rpath \
-                --with-lua
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install
-}
-
diff --git a/staging/celestia/celestia-1.5.1-gcc44.patch b/staging/celestia/celestia-1.5.1-gcc44.patch
deleted file mode 100644
index b1ee896f0..000000000
--- a/staging/celestia/celestia-1.5.1-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/celengine/overlay.h.orig	2009-07-08 02:27:08.000000000 -0400
-+++ src/celengine/overlay.h	2009-07-08 02:27:28.000000000 -0400
-@@ -10,6 +10,7 @@
- #ifndef _OVERLAY_H_
- #define _OVERLAY_H_
- 
-+#include <cstdio>
- #include <string>
- #include <iostream>
- #include <celtxf/texturefont.h>
---- src/celengine/star.cpp.orig	2009-07-08 02:40:52.000000000 -0400
-+++ src/celengine/star.cpp	2009-07-08 02:41:08.000000000 -0400
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
- 
- #include <celmath/mathlib.h>
-+#include <cstdio>
- #include <cstring>
- #include <cassert>
- #include "celestia.h"
diff --git a/staging/celestia/celestia-1.6.1-gcc46.patch b/staging/celestia/celestia-1.6.1-gcc46.patch
deleted file mode 100644
index ddf4036f2..000000000
--- a/staging/celestia/celestia-1.6.1-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366073
-
-Patch written by Nils Larsson <ni1s@nerdshack.com>
---- src/celengine/frametree.h
-+++ src/celengine/frametree.h
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/staging/celestia/celestia-1.6.1-gentoo.patch b/staging/celestia/celestia-1.6.1-gentoo.patch
deleted file mode 100644
index 57fffe159..000000000
--- a/staging/celestia/celestia-1.6.1-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
-+++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
-@@ -15,6 +15,7 @@
- if ENABLE_GTK
- SUBDIRS += gtk
- celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-
-Index: src/celengine/frametree.h
-===================================================================
---- src/celengine/frametree.h	(revision 5163)
-+++ src/celengine/frametree.h	(arbetskopia)
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/staging/celestia/celestia-1.6.1-libpng15.patch b/staging/celestia/celestia-1.6.1-libpng15.patch
deleted file mode 100644
index 5dffbab24..000000000
--- a/staging/celestia/celestia-1.6.1-libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
- 
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/staging/celestia/celestia-1.6.1-linking.patch b/staging/celestia/celestia-1.6.1-linking.patch
deleted file mode 100644
index d610d5243..000000000
--- a/staging/celestia/celestia-1.6.1-linking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking issues:
- * underlinking GLUT (bug #372123, #387609)
- * as-needed (bug #281258)
-
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -7,14 +7,15 @@
- 
- if ENABLE_KDE
- SUBDIRS += kde
--celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
--                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
- endif
- 
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-@@ -62,6 +63,7 @@
- 
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
- 
- if ENABLE_THEORA
-@@ -80,15 +82,16 @@
- celestia_LDADD = \
- 	$(celestiaKDELIBS) \
- 	$(celestiaGTKLIBS) \
--	$(DL_LIBS) \
--	$(LUA_LIBS) \
--	$(THEORA_LIBS) \
- 	../celengine/libcelengine.a \
- 	../celtxf/libceltxf.a \
- 	../cel3ds/libcel3ds.a \
- 	../celmath/libcelmath.a \
- 	../celutil/libcelutil.a \
--	$(SPICE_LIBS)
-+	$(LUA_LIBS) \
-+	$(THEORA_LIBS) \
-+	$(GLUTLIBS) \
-+	$(SPICE_LIBS) \
-+	$(DL_LIBS)
- 
- noinst_HEADERS = $(wildcard *.h)
- noinst_DATA = ../../celestia
diff --git a/staging/cinepaint/LICENSE b/staging/cinepaint/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/staging/cinepaint/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/staging/cinepaint/PKGBUILD b/staging/cinepaint/PKGBUILD
deleted file mode 100644
index e205c9c79..000000000
--- a/staging/cinepaint/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 147751 2012-01-27 22:56:00Z eric $
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=1.0
-pkgrel=2
-pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL' 'MIT')
-url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint')
-optdepends=('python2: for python plug-ins' 
-            'gutenprint: for print plug-ins'
-            'ghostscript: for pdf plug-ins')
-options=('!libtool')
-install=cinepaint.install
-source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz
-        LICENSE cinepaint-libpng15.patch)
-md5sums=('7dfdb005d246578392ac9bd500534804'
-         '169085743f667c250ea2e4022efecf5f'
-         '682de65ad358512d00a8b76730453664')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p1 -i ../cinepaint-libpng15.patch
-  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
-
-  aclocal -I aclocal
-  autoconf
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
-    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
-  sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/cinepaint/cinepaint-libpng15.patch b/staging/cinepaint/cinepaint-libpng15.patch
deleted file mode 100644
index e22edafae..000000000
--- a/staging/cinepaint/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
---- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
-+++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
-@@ -390,6 +390,16 @@
-   gchar		*progress;	/* Title for progress display... */
-   guchar	alpha[256],	/* Index -> Alpha */
-   		*alpha_ptr;	/* Temporary pointer */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  int compression_type;
-+  png_bytepp iccp_profile;
-+  png_uint_32 iccp_proflen;
-+  png_uint_32 width, height;
-+  png_byte channels;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. File corrupted?", filename);
-     return image;
-@@ -442,21 +452,26 @@
-   */
- 
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
-+  width=png_get_image_width(pp, info);
-+  height=png_get_image_height(pp, info);
- 
-  /*
-   * Latest attempt, this should be my best yet :)
-   */
- 
-+  bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
--  if(info->bit_depth == 16)
-+  if(bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-     png_set_expand(pp);
-   }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
-     png_set_packing(pp);
-   }
- 
-@@ -464,8 +479,8 @@
-   * Expand G+tRNS to GA, RGB+tRNS to RGBA
-   */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--                       (info->valid & PNG_INFO_tRNS)) {
-+  if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
-     png_set_expand(pp);
-   }
- 
-@@ -482,7 +497,7 @@
- 
- #if PNG_LIBPNG_VER > 99
-   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
-     /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
- 
-   png_read_update_info(pp, info);
-   
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 6;
-@@ -545,7 +560,7 @@
-   }
-   else
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 3;
-@@ -582,7 +597,7 @@
- 	  };
-   }
- 
--  image = gimp_image_new(info->width, info->height, image_type);
-+  image = gimp_image_new(width, height, image_type);
-   if (image == -1)
-   {
-     g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
-   * Create the "background" layer to hold the image...
-   */
- 
--  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new(image, _("Background"), width, height,
-                          layer_type, 100, NORMAL_MODE);
-   gimp_image_add_layer(image, layer, 0);
- 
-@@ -627,20 +642,21 @@
- 
-   empty= 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+  if (color_type & PNG_COLOR_MASK_PALETTE) {
- 
- #if PNG_LIBPNG_VER > 99
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
-         /* Calculates number of fully transparent "empty" entries */
- 
--      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
--                          info->num_palette - empty);
-+      gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+                          num_palette - empty);
-     } else {
--      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
-     }
- #else
--    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
- 
-   }
-@@ -659,18 +675,19 @@
-   */
- 
-   tile_height = gimp_tile_height ();
--  pixel       = g_new(guchar, tile_height * info->width * bpp);
-+  pixel       = g_new(guchar, tile_height * width * bpp);
-   pixels      = g_new(guchar *, tile_height);
-+  channels=png_get_channels(pp, info);
- 
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i * 2;
-+		  pixels[i] = pixel + width * channels * i * 2;
-   }
-   else
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i;
-+		  pixels[i] = pixel + width * channels * i;
-   }
- 
-   for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- 	   */
- 
- 	  for (begin = 0, end = tile_height;
--			  begin < info->height;
-+			  begin < height;
- 			  begin += tile_height, end += tile_height)
- 	  {
--		  if (end > info->height)
--			  end = info->height;
-+		  if (end > height)
-+			  end = height;
- 
- 		  num = end - begin;
- 
-@@ -697,20 +714,21 @@
- 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- 				  drawable->width, num);
- 
--		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+		  gimp_progress_update(((double)pass + (double)end / (double)height) /
- 				  (double)num_passes);
- 	  };
-   };
- 
- #if defined(PNG_iCCP_SUPPORTED)
-   /* set icc profile */
--  if (info->iccp_proflen > 0) {
--    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
--                                              info->iccp_profile,
--                                              ICC_IMAGE_PROFILE);
-+  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+  if (iccp_proflen > 0) {
-+    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+				       (gchar *)iccp_profile,
-+				       ICC_IMAGE_PROFILE);
-     printf ("%s:%d %s() set embedded profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -808,6 +826,14 @@
-                 blue;           /* Used for palette background */
-   time_t	cutime;         /* Time since epoch */
-   struct tm	*gmt;		/* GMT broken down */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  int filter_method=0;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  png_uint_32 height;
-+  int compression_type;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +849,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. Couldn't save image", filename);
-     return 0;
-@@ -857,15 +882,6 @@
-   drawable = gimp_drawable_get (drawable_ID);
-   type     = gimp_drawable_type (drawable_ID);
- 
-- /*
--  * Set the image dimensions, bit depth, interlacing and compression
--  */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->interlace_type = pngvals.interlaced;
- 
-  /*
-   * Set color type and remember bytes per pixel count 
-@@ -874,71 +890,69 @@
-   switch (type)
-   {
-     case RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 8;
-         bpp              = 3;
-         break;
-     case RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 4;
-         break;
-     case GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 8;
-         bpp              = 1;
-         break;
-     case GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 2;
-         break;
-     case INDEXED_IMAGE :
- 	bpp		 = 1;
--	info->bit_depth      = 8;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case INDEXEDA_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 8;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 8;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     case U16_RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 16;
-         bpp              = 6;
-         break;
-     case U16_RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 8;
-         break;
-     case U16_GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 16;
-         bpp              = 2;
-         break;
-     case U16_GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 4;
-         break;
-     case U16_INDEXED_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 16;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case U16_INDEXEDA_IMAGE :
- 	bpp		 = 4;
--	info->bit_depth      = 16;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 16;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     default:
-@@ -950,30 +964,36 @@
-   * Fix bit depths for (possibly) smaller colormap images
-   */
-   
--  if (info->valid & PNG_INFO_PLTE) {
--    if (info->num_palette <= 2)
--      info->bit_depth= 1;
--    else if (info->num_palette <= 4)
--      info->bit_depth= 2;
--    else if (info->num_palette <= 16)
--      info->bit_depth= 4;
-+  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-+    if (num_palette <= 2)
-+      bit_depth= 1;
-+    else if (num_palette <= 4)
-+      bit_depth= 2;
-+    else if (num_palette <= 16)
-+      bit_depth= 4;
-     /* otherwise the default is fine */
-   }
- 
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
-   // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
-   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
--    int size;
-+    int  size;
-     char *buffer;
-     
-     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
-                                                 ICC_IMAGE_PROFILE);
-     png_set_iCCP (pp, info,
-            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
--                  0, buffer, size);
-+                  0, (png_const_bytep)buffer, size);
-     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -1039,13 +1059,13 @@
-   * Convert unpacked pixels to packed if necessary
-   */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
-     png_set_packing(pp);
- 
-   /* Set swapping for 16 bit per sample images */
-   
- #ifndef WORDS_BIGENDIAN
--  if (info->bit_depth == 16)
-+  if (bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
-   
-@@ -1063,6 +1083,7 @@
- 
-   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
-                       drawable->height, FALSE, FALSE);
-+  height=png_get_image_height(pp, info);
- 
-   for (pass = 0; pass < num_passes; pass ++)
-   {
-@@ -1077,7 +1098,7 @@
- 	num = end - begin;
- 	
- 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
--        if (info->valid & PNG_INFO_tRNS) {
-+        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
-             }
-           }
-        /* Forgot this case before, what if there are too many colors? */
--        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1095,9 +1116,8 @@
-         }
- 	
- 	png_write_rows (pp, pixels, num);
--	
- 	gimp_progress_update (((double)pass + (double)end /
--                    (double)info->height) / (double)num_passes);
-+                    (double)height) / (double)num_passes);
-       };
-   };
- 
diff --git a/staging/cinepaint/cinepaint.install b/staging/cinepaint/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/staging/cinepaint/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/claws-mail/PKGBUILD b/staging/claws-mail/PKGBUILD
deleted file mode 100644
index 3e6cc2033..000000000
--- a/staging/claws-mail/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 145932 2012-01-04 09:30:31Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=claws-mail
-pkgver=3.8.0
-pkgrel=2
-pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
-         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
-optdepends=('python2:           needed for some tools'
-            'perl:              needed for some tools'
-            'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering')
-replaces=('sylpheed-claws')
-provides=('claws')
-options=(!libtool)
-install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('df9f1657d7f34959a2205344d952c2e3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-
-  ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --disable-dillo-viewer-plugin \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --enable-jpilot
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # build and install extra tools
-  cd tools
-  make
-   # all executables and .conf files ; only top directory
-  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-      install -D -m755 ${i} \
-        ${pkgdir}/usr/lib/claws-mail/tools/${i}
-  done
-}
diff --git a/staging/claws-mail/claws-mail.install b/staging/claws-mail/claws-mail.install
deleted file mode 100644
index a6ae1eae6..000000000
--- a/staging/claws-mail/claws-mail.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
diff --git a/staging/db/PKGBUILD b/staging/db/PKGBUILD
deleted file mode 100644
index bfa1e8405..000000000
--- a/staging/db/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 145784 2011-12-31 17:44:46Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=db
-pkgver=5.3.15
-pkgrel=1
-pkgdesc="The Berkeley DB embedded database system"
-arch=('i686' 'x86_64')
-url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-license=('custom')
-depends=('gcc-libs' 'sh')
-options=('!libtool')
-install=db.install
-source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('7683b632a01ff3543c379a120809a942ec457738')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --enable-static --enable-cxx --enable-dbm
-  make LIBSO_LIBS=-lpthread
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/docs
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/db/db.install b/staging/db/db.install
deleted file mode 100644
index 03b64042d..000000000
--- a/staging/db/db.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 5.1)" -lt 0 ]; then
-    echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
-  fi
-}
diff --git a/staging/digikam/PKGBUILD b/staging/digikam/PKGBUILD
deleted file mode 100644
index 8f9780a19..000000000
--- a/staging/digikam/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.5.0
-pkgrel=5
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
-             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	"boost148.patch" "libkipi140.patch")
-sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383'
-          '93853084905b21309c46ce7d585021e76283d429'
-          '8a8f624fd0ca768a9dcd706405eb6e4944892d87')
-build() {
-  cd "${srcdir}"
-
-  pushd ${pkgname}-${pkgver}/core
-  patch -Np0 -i ${srcdir}/boost148.patch
-  patch -Np1 -i ${srcdir}/libkipi140.patch
-  popd
-
-  mkdir build
-  cd build
-  # Use internal lensfun (FS#21816)
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DLENSFUN_LIBRARY="" \
-    -DLENSFUN_INCLUDE_DIR=""
-  make
-}
-
-package_digikam() {
-  pkgdesc="Digital photo management application for KDE"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
-           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
-  optdepends=('kipi-plugins: for more extras and plugins')
-  install=digikam.install
-
-  cd "${srcdir}"/build/core
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/po
-  make DESTDIR="${pkgdir}" install
-
-  # these are in oxygen-icons
-  rm -rf ${pkgdir}/usr/share/icons
-}
-
-package_libkface() {
-  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
-  depends=('kdelibs' 'opencv')
-
-  cd "${srcdir}"/build/extra/libkface
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
-
-  cd "${srcdir}"/build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd "${srcdir}"/build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
-  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
-  depends=('kdelibs')
-
-  cd "${srcdir}"/build/extra/libmediawiki
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kipi-plugins() {
-  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
-  optdepends=('libkgeomap'
-              'libmediawiki'
-              'libgpod'
-              'hugin')
-  install=kipi-plugins.install
-
-  cd "${srcdir}"/build/extra/kipi-plugins
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/digikam/boost148.patch b/staging/digikam/boost148.patch
deleted file mode 100644
index 6d3ff585b..000000000
--- a/staging/digikam/boost148.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
---- libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 08:32:19.837388059 -0500
-+++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 09:17:27.798341897 -0500
-@@ -1198,7 +1198,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
-                                           distance_map(VertexIntMapAdaptor(distances)).
-                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Invert the default compare method: With greater, we get the longest path
-                                           distance_compare(std::greater<int>()).
-                                           // will be returned if a node is unreachable
-@@ -1384,14 +1384,15 @@
-         template <class GraphType, typename VertexLessThan>
-         class lessThanMapEdgeToTarget
-         {
-+            typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
-         public:
-             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
-                 : g(g), vertexLessThan(vertexLessThan) {}
-             const GraphType& g;
-             VertexLessThan vertexLessThan;
--            bool operator()(const Edge& a, const Edge& b)
-+            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
-             {
--                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
-+                return vertexLessThan(boost::target(a, g), boost::target(b, g));
-             }
-         };
- 
-@@ -1402,20 +1403,21 @@
-         {
-             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
- 
--            QList<Edge>             outEdges;
-+            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+            QList<edge_descriptor> outEdges;
-             std::vector<VertexInfo> stack;
- 
-             boost::put(color, u, boost::gray_color);
-             vis.discover_vertex(u, g);
- 
--            outEdges = toEdgeList(boost::out_edges(u, g));
-+            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
-             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
-             // maps the given edges to their targets, and calls our vertex lessThan.
-             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
- 
--            foreach(const Edge& e, outEdges)
-+            foreach(const edge_descriptor& e, outEdges)
-             {
--                Vertex v = boost::target(e.toEdge(), g);
-+                Vertex v = boost::target(e, g);
-                 vis.examine_edge(e, g);
-                 boost::default_color_type v_color = boost::get(color, v);
-                 if (v_color == boost::white_color)
diff --git a/staging/digikam/digikam.install b/staging/digikam/digikam.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/digikam/digikam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/digikam/kipi-plugins.install b/staging/digikam/kipi-plugins.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/digikam/kipi-plugins.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/digikam/libkipi140.patch b/staging/digikam/libkipi140.patch
deleted file mode 100644
index a221b5847..000000000
--- a/staging/digikam/libkipi140.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/utilities/setup/setupplugins.cpp
-+++ b/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
- 
-     panel->setLayout(mainLayout);
- 
-+#if KIPI_VERSION < 0x010400
-+    d->checkAllBtn->setVisible(false);
-+    d->clearBtn->setVisible(false);
-+#endif
-+
-     initPlugins();
- 
-     // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotCheckAll();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
- void SetupPlugins::slotClear()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotClear();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
-diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/utilities/setup/setupplugins.h
-+++ b/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-
-  
diff --git a/staging/djvulibre/PKGBUILD b/staging/djvulibre/PKGBUILD
deleted file mode 100644
index ef6bc1842..000000000
--- a/staging/djvulibre/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 147068 2012-01-21 14:25:07Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: mgushee
-
-pkgname=djvulibre
-pkgver=3.5.24
-pkgrel=3
-pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://djvu.sourceforge.net/"
-depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme')
-makedepends=('pkg-config')
-provides=("libdjvu=${pkgver}")
-replaces=('libdjvu')
-conflicts=('libdjvu')
-optdepends=('djview4: Viewer application')
-options=('!libtool')
-install=djvulibre.install
-source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz
-        git-fixes.patch)
-md5sums=('af83d27af5083198432a178d22b259c5'
-         'ff3798e383e9c3fae407455d8a51deec')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr --disable-desktopfiles
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  #Install icons for mime-types.
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes
-  for sz in 22 32 48 64; do
-    install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
-  done
-}
diff --git a/staging/djvulibre/djvulibre.install b/staging/djvulibre/djvulibre.install
deleted file mode 100644
index 3e9bb5c49..000000000
--- a/staging/djvulibre/djvulibre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gtk-update-icon-cache ]; then  
-    gtk-update-icon-cache -q -f usr/share/icons/hicolor
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/djvulibre/git-fixes.patch b/staging/djvulibre/git-fixes.patch
deleted file mode 100644
index 3077cf0b4..000000000
--- a/staging/djvulibre/git-fixes.patch
+++ /dev/null
@@ -1,1607 +0,0 @@
-From 3341545edba359b292a8ef6db1b7d342caf3dcf1 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Wed, 4 May 2011 21:25:35 -0700
-Subject: [PATCH] Added include <stddef.h> for gcc-4.6
-
----
- libdjvu/BSByteStream.cpp       |    1 +
- libdjvu/BSEncodeByteStream.cpp |    1 +
- libdjvu/ByteStream.cpp         |    1 +
- libdjvu/DjVuFileCache.cpp      |    1 +
- libdjvu/DjVuGlobal.cpp         |    2 ++
- libdjvu/DjVuGlobalMemory.cpp   |    2 ++
- libdjvu/DjVuMessage.cpp        |    1 +
- libdjvu/DjVuMessageLite.cpp    |    2 +-
- libdjvu/DjVuPalette.cpp        |    2 ++
- libdjvu/DjVuPort.h             |    1 +
- libdjvu/DjVuToPS.cpp           |    1 +
- libdjvu/GBitmap.cpp            |    2 ++
- libdjvu/GException.cpp         |    1 +
- libdjvu/GOS.cpp                |    1 +
- libdjvu/GPixmap.cpp            |    2 ++
- libdjvu/GSmartPointer.cpp      |    1 +
- libdjvu/GSmartPointer.h        |    2 ++
- libdjvu/GString.cpp            |    1 +
- libdjvu/GString.h              |    1 +
- libdjvu/GThreads.cpp           |    2 ++
- libdjvu/GURL.cpp               |    1 +
- libdjvu/GUnicode.cpp           |    2 ++
- libdjvu/IFFByteStream.h        |    1 +
- libdjvu/IW44EncodeCodec.cpp    |    1 +
- libdjvu/IW44Image.cpp          |    1 +
- libdjvu/JPEGDecoder.h          |    1 +
- libdjvu/MMX.cpp                |    1 +
- libdjvu/UnicodeByteStream.h    |    1 +
- libdjvu/XMLParser.cpp          |    1 +
- libdjvu/ZPCodec.cpp            |    2 ++
- libdjvu/atomic.cpp             |    1 +
- libdjvu/ddjvuapi.cpp           |    1 +
- libdjvu/ddjvuapi.h             |    1 +
- libdjvu/miniexp.cpp            |    1 +
- libdjvu/miniexp.h              |    3 ++-
- tools/bzz.cpp                  |    1 +
- tools/c44.cpp                  |    1 +
- tools/cjb2.cpp                 |    1 +
- tools/cpaldjvu.cpp             |    1 +
- tools/csepdjvu.cpp             |    1 +
- tools/ddjvu.cpp                |    1 +
- tools/djvm.cpp                 |    2 +-
- tools/djvmcvt.cpp              |    1 +
- tools/djvudump.cpp             |    1 +
- tools/djvuextract.cpp          |    1 +
- tools/djvumake.cpp             |    1 +
- tools/djvups.cpp               |    1 +
- tools/djvused.cpp              |    1 +
- tools/djvuserve.cpp            |    1 +
- tools/djvutxt.cpp              |    1 +
- tools/tiff2pdf.h               |    1 +
- xmltools/djvutoxml.cpp         |    1 +
- xmltools/djvuxmlparser.cpp     |    1 +
- 53 files changed, 63 insertions(+), 3 deletions(-)
-
-diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp
-index b762ccf..d662ab0 100644
---- a/libdjvu/BSByteStream.cpp
-+++ b/libdjvu/BSByteStream.cpp
-@@ -62,6 +62,7 @@
- 
- // - Author: Leon Bottou, 07/1998
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp
-index 5d80e51..68bc3e3 100644
---- a/libdjvu/BSEncodeByteStream.cpp
-+++ b/libdjvu/BSEncodeByteStream.cpp
-@@ -71,6 +71,7 @@
- #include "GOS.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp
-index 158c33c..be01847 100644
---- a/libdjvu/ByteStream.cpp
-+++ b/libdjvu/ByteStream.cpp
-@@ -73,6 +73,7 @@
- #include "GOS.h"
- #include "GURL.h"
- #include "DjVuMessage.h"
-+#include <stddef.h>
- #include <fcntl.h>
- #if defined(WIN32) || defined(__CYGWIN32__)
- # include <io.h>
-diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp
-index 6b1e85d..7d7a192 100644
---- a/libdjvu/DjVuFileCache.cpp
-+++ b/libdjvu/DjVuFileCache.cpp
-@@ -63,6 +63,7 @@
- #include "DjVuFileCache.h"
- #include "debug.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp
-index e6d3cec..df9278e 100644
---- a/libdjvu/DjVuGlobal.cpp
-+++ b/libdjvu/DjVuGlobal.cpp
-@@ -76,6 +76,8 @@
- #include "GThreads.h"
- #include "GException.h"
- #include "GContainer.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp
-index 3c6012c..c8ba309 100644
---- a/libdjvu/DjVuGlobalMemory.cpp
-+++ b/libdjvu/DjVuGlobalMemory.cpp
-@@ -67,6 +67,8 @@
- 
- #include "DjVuGlobal.h"
- #include "GException.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #include "debug.h"
-diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp
-index 6f5a735..1726025 100644
---- a/libdjvu/DjVuMessage.cpp
-+++ b/libdjvu/DjVuMessage.cpp
-@@ -71,6 +71,7 @@
- #include "debug.h"
- #include <ctype.h>
- #include <string.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #ifdef WIN32
- # include <tchar.h>
-diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp
-index b8c1010..5daa9d9 100644
---- a/libdjvu/DjVuMessageLite.cpp
-+++ b/libdjvu/DjVuMessageLite.cpp
-@@ -73,8 +73,8 @@
- #include "debug.h"
- #include <ctype.h>
- #include <string.h>
-+#include <stddef.h>
- #include <stdlib.h>
--// #include <stdio.h>
- #ifdef WIN32
- #include <tchar.h>
- #include <windows.h>
-diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp
-index c489f7b..76b0bf4 100644
---- a/libdjvu/DjVuPalette.cpp
-+++ b/libdjvu/DjVuPalette.cpp
-@@ -64,6 +64,8 @@
- #include "ByteStream.h"
- #include "BSByteStream.h"
- #include "DjVuPalette.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <math.h>
- 
-diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
-index f6a92f6..e2b3125 100644
---- a/libdjvu/DjVuPort.h
-+++ b/libdjvu/DjVuPort.h
-@@ -65,6 +65,7 @@
- 
- #include "GThreads.h"
- #include "GURL.h"
-+#include "stddef.h"
- 
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
-diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp
-index 5517bf3..6914ff9 100644
---- a/libdjvu/DjVuToPS.cpp
-+++ b/libdjvu/DjVuToPS.cpp
-@@ -72,6 +72,7 @@
- #include "GPixmap.h"
- #include "debug.h"
- #include <stdarg.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <time.h>
-diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
-index ab5c0de..797edcc 100644
---- a/libdjvu/GBitmap.cpp
-+++ b/libdjvu/GBitmap.cpp
-@@ -66,6 +66,8 @@
- #include "GString.h"
- #include "GThreads.h"
- #include "GException.h"
-+#include <stddef.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- // - Author: Leon Bottou, 05/1997
-diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp
-index 2ea179a..89da70f 100644
---- a/libdjvu/GException.cpp
-+++ b/libdjvu/GException.cpp
-@@ -60,6 +60,7 @@
- # pragma implementation
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp
-index e784932..d2088e2 100644
---- a/libdjvu/GOS.cpp
-+++ b/libdjvu/GOS.cpp
-@@ -65,6 +65,7 @@
- #include "GOS.h"
- #include "GURL.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
-diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp
-index 392df54..4bf6f57 100644
---- a/libdjvu/GPixmap.cpp
-+++ b/libdjvu/GPixmap.cpp
-@@ -75,6 +75,8 @@
- #include "GThreads.h"
- #include "Arrays.h"
- #include "JPEGDecoder.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <math.h>
- #include <assert.h>
-diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp
-index 6e523e7..58aef5b 100644
---- a/libdjvu/GSmartPointer.cpp
-+++ b/libdjvu/GSmartPointer.cpp
-@@ -67,6 +67,7 @@
- // Our original implementation consisted of multiple classes.
- // <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
- 
-+#include <stddef.h>
- #include <string.h>
- #if PARANOID_DEBUG
- # include <assert.h>
-diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h
-index 82781bd..8a8bb8a 100644
---- a/libdjvu/GSmartPointer.h
-+++ b/libdjvu/GSmartPointer.h
-@@ -97,6 +97,8 @@
- #include "DjVuGlobal.h"
- #include "atomic.h"
- 
-+#include <stddef.h>
-+
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
- # ifdef NOT_DEFINED // Just to fool emacs c++ mode
-diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
-index 03f6226..350b11b 100644
---- a/libdjvu/GString.cpp
-+++ b/libdjvu/GString.cpp
-@@ -73,6 +73,7 @@
- #include "GThreads.h"
- #include "debug.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/GString.h b/libdjvu/GString.h
-index b63b753..3aa1f76 100644
---- a/libdjvu/GString.h
-+++ b/libdjvu/GString.h
-@@ -108,6 +108,7 @@
- #include "DjVuGlobal.h"
- #include "GContainer.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #ifdef WIN32
-diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
-index d81f3c3..253fed8 100644
---- a/libdjvu/GThreads.cpp
-+++ b/libdjvu/GThreads.cpp
-@@ -71,6 +71,8 @@
- #include "GThreads.h"
- #include "GException.h"
- #include "DjVuMessageLite.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- 
-diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp
-index c37bf52..a80078c 100644
---- a/libdjvu/GURL.cpp
-+++ b/libdjvu/GURL.cpp
-@@ -72,6 +72,7 @@
- #include "GURL.h"
- #include "debug.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
-diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp
-index 415c081..a8b25b8 100644
---- a/libdjvu/GUnicode.cpp
-+++ b/libdjvu/GUnicode.cpp
-@@ -62,6 +62,8 @@
- 
- #include "GString.h"
- 
-+#include <stddef.h>
-+
- #if HAS_ICONV
- #include <iconv.h>
- #endif
-diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h
-index a653f8c..e31b216 100644
---- a/libdjvu/IFFByteStream.h
-+++ b/libdjvu/IFFByteStream.h
-@@ -124,6 +124,7 @@
- 
- 
- #include "DjVuGlobal.h"
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
-index 8d7b12c..49081b7 100644
---- a/libdjvu/IW44EncodeCodec.cpp
-+++ b/libdjvu/IW44EncodeCodec.cpp
-@@ -76,6 +76,7 @@
- #include "IFFByteStream.h"
- #include "GRect.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
-index 9476726..4a19fb5 100644
---- a/libdjvu/IW44Image.cpp
-+++ b/libdjvu/IW44Image.cpp
-@@ -76,6 +76,7 @@
- #include "IFFByteStream.h"
- #include "GRect.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h
-index bd430a0..fad1d4c 100644
---- a/libdjvu/JPEGDecoder.h
-+++ b/libdjvu/JPEGDecoder.h
-@@ -64,6 +64,7 @@
- 
- #ifdef NEED_JPEG_DECODER
- 
-+#include <stddef.h>
- #include <string.h>
- #include <setjmp.h>
- 
-diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
-index 5ab60bb..528dab6 100644
---- a/libdjvu/MMX.cpp
-+++ b/libdjvu/MMX.cpp
-@@ -62,6 +62,7 @@
- 
- #include "MMX.h"
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h
-index 0ae112b..9b49a17 100644
---- a/libdjvu/UnicodeByteStream.h
-+++ b/libdjvu/UnicodeByteStream.h
-@@ -88,6 +88,7 @@
- #include "GString.h"
- #include "ByteStream.h"
- 
-+#include <stddef.h>
- 
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
-diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
-index 84386c5..7da923a 100644
---- a/libdjvu/XMLParser.cpp
-+++ b/libdjvu/XMLParser.cpp
-@@ -75,6 +75,7 @@
- #include "debug.h"
- #include <stdio.h>
- #include <ctype.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp
-index f6e971d..ff5b9bf 100644
---- a/libdjvu/ZPCodec.cpp
-+++ b/libdjvu/ZPCodec.cpp
-@@ -66,6 +66,8 @@
- #include "ZPCodec.h"
- #include "ByteStream.h"
- #include "GException.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <assert.h>
- #include <math.h>
-diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp
-index bdc193e..63fd483 100644
---- a/libdjvu/atomic.cpp
-+++ b/libdjvu/atomic.cpp
-@@ -28,6 +28,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <assert.h>
- #include "atomic.h"
-diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp
-index b18b84b..f40f5aa 100644
---- a/libdjvu/ddjvuapi.cpp
-+++ b/libdjvu/ddjvuapi.cpp
-@@ -60,6 +60,7 @@
- # pragma implementation "ddjvuapi.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
-index d0ed48f..841f223 100644
---- a/libdjvu/ddjvuapi.h
-+++ b/libdjvu/ddjvuapi.h
-@@ -64,6 +64,7 @@ extern "C" {
- }
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- 
-diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
-index e0fb087..fc51297 100644
---- a/libdjvu/miniexp.cpp
-+++ b/libdjvu/miniexp.cpp
-@@ -23,6 +23,7 @@
- # pragma implementation "miniexp.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
-diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h
-index 91e345d..993005b 100644
---- a/libdjvu/miniexp.h
-+++ b/libdjvu/miniexp.h
-@@ -38,7 +38,8 @@ extern "C" {
- #ifndef MINILISPAPI
- # define MINILISPAPI /**/
- #endif
--  
-+
-+#include <stddef.h>  
- 
- /* -------------------------------------------------- */
- /* LISP EXPRESSIONS                                   */
-diff --git a/tools/bzz.cpp b/tools/bzz.cpp
-index ca092e1..2ebc7b9 100644
---- a/tools/bzz.cpp
-+++ b/tools/bzz.cpp
-@@ -94,6 +94,7 @@
- #include "GURL.h"
- #include "DjVuMessage.h"
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- static const char *program = "(unknown)";
-diff --git a/tools/c44.cpp b/tools/c44.cpp
-index 6f23b53..855504b 100644
---- a/tools/c44.cpp
-+++ b/tools/c44.cpp
-@@ -226,6 +226,7 @@
- #include <locale.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- // command line data
-diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp
-index 8cf89b9..11eb662 100644
---- a/tools/cjb2.cpp
-+++ b/tools/cjb2.cpp
-@@ -120,6 +120,7 @@
- #include "jb2tune.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #if HAVE_TIFF
- #include <tiffio.h>
-diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp
-index 111cbd3..b640a7a 100644
---- a/tools/cpaldjvu.cpp
-+++ b/tools/cpaldjvu.cpp
-@@ -118,6 +118,7 @@
- #include "jb2tune.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <math.h>
- 
-diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
-index cd721f8..d5203d5 100644
---- a/tools/csepdjvu.cpp
-+++ b/tools/csepdjvu.cpp
-@@ -162,6 +162,7 @@
- #include "jb2tune.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- #undef MIN
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 817e045..981a270 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -62,6 +62,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-diff --git a/tools/djvm.cpp b/tools/djvm.cpp
-index 951bd66..6ea88c2 100644
---- a/tools/djvm.cpp
-+++ b/tools/djvm.cpp
-@@ -135,9 +135,9 @@
- #include "DjVuMessage.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
--#include <stdlib.h>
- 
- static const char * progname;
- 
-diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp
-index 9ca1c54..20b468a 100644
---- a/tools/djvmcvt.cpp
-+++ b/tools/djvmcvt.cpp
-@@ -144,6 +144,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- static const char * progname;
-diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
-index 6a0215a..2dddbdf 100644
---- a/tools/djvudump.cpp
-+++ b/tools/djvudump.cpp
-@@ -119,6 +119,7 @@ xxx
- #include <locale.h>
- #include <stdio.h>
- #include <ctype.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- void
-diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp
-index 4a9f381..907b99c 100644
---- a/tools/djvuextract.cpp
-+++ b/tools/djvuextract.cpp
-@@ -105,6 +105,7 @@
- #include "GOS.h"
- #include "DjVuMessage.h"
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp
-index 7020484..4c5fc0f 100644
---- a/tools/djvumake.cpp
-+++ b/tools/djvumake.cpp
-@@ -153,6 +153,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <ctype.h>
- 
-diff --git a/tools/djvups.cpp b/tools/djvups.cpp
-index 51aa999..632b832 100644
---- a/tools/djvups.cpp
-+++ b/tools/djvups.cpp
-@@ -57,6 +57,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-diff --git a/tools/djvused.cpp b/tools/djvused.cpp
-index de84dcd..687fdca 100644
---- a/tools/djvused.cpp
-+++ b/tools/djvused.cpp
-@@ -61,6 +61,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <errno.h>
-diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp
-index 19a17da..818fe78 100644
---- a/tools/djvuserve.cpp
-+++ b/tools/djvuserve.cpp
-@@ -73,6 +73,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <time.h>
-diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp
-index ba2c745..9e9124c 100644
---- a/tools/djvutxt.cpp
-+++ b/tools/djvutxt.cpp
-@@ -61,6 +61,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h
-index 082f5fb..656dc43 100644
---- a/tools/tiff2pdf.h
-+++ b/tools/tiff2pdf.h
-@@ -22,6 +22,7 @@
- # endif
- # if HAVE_TIFF
- #  include <stdio.h>
-+#  include <stddef.h>
- #  include <stdlib.h>
- #  include <tiff.h>
- #  include <tiffio.h>
-diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp
-index 17c769b..b40535e 100644
---- a/xmltools/djvutoxml.cpp
-+++ b/xmltools/djvutoxml.cpp
-@@ -71,6 +71,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <assert.h>
-diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp
-index bdc5768..6679a9d 100644
---- a/xmltools/djvuxmlparser.cpp
-+++ b/xmltools/djvuxmlparser.cpp
-@@ -70,6 +70,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- static void 
--- 
-1.7.4.1
-
-From 3cc41e2a72bbd6d34e81a9a214abbebf41cc00c7 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sat, 21 May 2011 09:27:17 -0700
-Subject: [PATCH] Added ddjvu option to skip corrupted pages.
-
----
- tools/ddjvu.1   |    7 +++++++
- tools/ddjvu.cpp |   49 +++++++++++++++++++++++++++++++++----------------
- 2 files changed, 40 insertions(+), 16 deletions(-)
-
-diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
-index 29285c3..7d3d105 100644
---- a/tools/ddjvu.1
-+++ b/tools/ddjvu.1
-@@ -178,6 +178,13 @@ select specific layers of a DjVu image.
- These modes can fail if the DjVu image does 
- not contain the selected layer.
- .RE
-+.TP
-+.BI "-skip"
-+Instead of aborting when encountering a corrupted page,
-+this option causes
-+.BR ddjvu
-+to simply skip the corrupted page and continue with the next.
-+This is useful for processing certain damaged files.
- 
- .SH RESOLUTION OPTIONS
- The following options control the resolution of the output image.  
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 981a270..b9cb038 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -132,6 +132,7 @@ ddjvu_rect_t info_size;
- ddjvu_rect_t info_segment;
- const char  *inputfilename = 0;
- const char  *outputfilename = 0;
-+int          flag_skip_corrupted = 0;
- 
- #if HAVE_TIFF2PDF
- char *tempfilename = 0;
-@@ -164,7 +165,6 @@ handle(int wait)
-           if (msg->m_error.filename)
-             fprintf(stderr,"ddjvu: '%s:%d'\n", 
-                     msg->m_error.filename, msg->m_error.lineno);
--          exit(10);
-         default:
-           break;
-         }
-@@ -554,8 +554,16 @@ dopage(int pageno)
-   while (! ddjvu_page_decoding_done(page))
-     handle(TRUE);
-   if (ddjvu_page_decoding_error(page))
--    die(i18n("Cannot decode page %d."), pageno);
--  
-+    {
-+      handle(FALSE);
-+      fprintf(stderr,"ddjvu: ");
-+      fprintf(stderr,i18n("Cannot decode page %d."), pageno);
-+      fprintf(stderr,"\n");
-+      if (flag_skip_corrupted)
-+        return;
-+      else
-+        exit(10);
-+    }
-   timingdata[1] = ticks();
-   /* Open files */
-   if (flag_format == 't')
-@@ -753,19 +761,20 @@ usage()
-     i18n("DjVu decompression utility\n\n"
-          "Usage: ddjvu [options] [<djvufile> [<outputfile>]]\n\n"
-          "Options:\n"
--         "  -verbose          Prints various informational messages.\n"
--         "  -format=FMT       Selects output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
--         "  -scale=N          Selects display scale.\n"
--         "  -size=WxH         Selects size of rendered image.\n"
--         "  -subsample=N      Selects direct subsampling factor.\n"
--         "  -aspect=no        Authorizes aspect ratio changes\n"
--         "  -segment=WxH+X+Y  Selects which segment of the rendered image\n"
--         "  -mode=black       Renders a meaningful bitonal image.\n"
--         "  -mode=mask        Only renders the mask layer.\n"
--         "  -mode=foreground  Only renders the foreground layer.\n"
--         "  -mode=background  Only renders the background layer.\n"
--         "  -page=PAGESPEC    Selects page(s) to be decoded.\n"
--         "  -quality=QUALITY  Specifies jpeg quality for lossy tiff output.\n"
-+         "  -verbose          Print various informational messages.\n"
-+         "  -format=FMT       Select output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
-+         "  -scale=N          Select display scale.\n"
-+         "  -size=WxH         Select size of rendered image.\n"
-+         "  -subsample=N      Select direct subsampling factor.\n"
-+         "  -aspect=no        Authorize aspect ratio changes\n"
-+         "  -segment=WxH+X+Y  Select which segment of the rendered image\n"
-+         "  -mode=black       Render a meaningful bitonal image.\n"
-+         "  -mode=mask        Only render the mask layer.\n"
-+         "  -mode=foreground  Only render the foreground layer.\n"
-+         "  -mode=background  Only render the background layer.\n"
-+         "  -page=PAGESPEC    Select page(s) to be decoded.\n"
-+         "  -skip             Skip corrupted pages instead of aborting.\n"
-+         "  -quality=QUALITY  Specify jpeg quality for lossy tiff output.\n"
-          "\n"
-          "If <outputfile> is a single dash or omitted, the decompressed image\n"
-          "is sent to the standard output.  If <djvufile> is a single dash or\n"
-@@ -846,6 +855,12 @@ parse_option(int argc, char **argv, int i)
-         die(i18n(errarg), opt);
-       flag_verbose = 1;
-     }
-+  if (!strcmp(opt,"skip"))
-+    {
-+      if (arg) 
-+        die(i18n(errarg), opt);
-+      flag_skip_corrupted = 1;
-+    }
-   else if (!strcmp(opt,"scale"))
-     {
-       if (!arg) 
-@@ -1012,6 +1027,8 @@ main(int argc, char **argv)
-     die(i18n("Cannot open djvu document '%s'."), inputfilename);
-   while (! ddjvu_document_decoding_done(doc))
-     handle(TRUE);
-+  if (ddjvu_document_decoding_error(doc))
-+    die(i18n("Cannot decode document."));
-   
-   /* Process all pages */
-   i = ddjvu_document_get_pagenum(doc);
--- 
-1.7.4.1
-
-From 6a6e6a047b41a431cfc091bd71fcad554fd79437 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Mon, 30 May 2011 18:52:33 -0700
-Subject: [PATCH] Added option -o outputfile to djvudump.
-
----
- tools/djvudump.1   |    2 +-
- tools/djvudump.cpp |   34 +++++++++++++++++++++++++---------
- 2 files changed, 26 insertions(+), 10 deletions(-)
-
-diff --git a/tools/djvudump.1 b/tools/djvudump.1
-index c86b7d5..e39a318 100644
---- a/tools/djvudump.1
-+++ b/tools/djvudump.1
-@@ -27,7 +27,7 @@
- djvudump \- Display internal structure of DjVu files.
- 
- .SH SYNOPSIS
--.BI "djvudump " "djvufiles" "..."
-+.BI "djvudump [-o " "outputfile" "] " "djvufiles" "..."
- 
- .SH DESCRIPTION
- Program 
-diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
-index 2dddbdf..6daaf2c 100644
---- a/tools/djvudump.cpp
-+++ b/tools/djvudump.cpp
-@@ -122,6 +122,9 @@ xxx
- #include <stddef.h>
- #include <stdlib.h>
- 
-+const char *outputfile = 0;
-+FILE *outputf = stdout;
-+
- void
- display(const GURL &url)
- {
-@@ -134,7 +137,7 @@ display(const GURL &url)
-    obs->seek(0);
-    obs->readall(buf, size);
-    GNativeString ns = str;
--   fputs((const char*)ns, stdout);
-+   fputs((const char*)ns, outputf);
- }
- 
- 
-@@ -146,7 +149,7 @@ usage()
-           "DJVUDUMP --- DjVuLibre-" DJVULIBRE_VERSION "\n"
- #endif
-           "Describes DjVu and IFF85 files\n\n"
--          "Usage: djvudump <iff_filenames>\n" );
-+          "Usage: djvudump [-o outputfile] <iff_filenames>\n" );
-   exit(1);
- }
- 
-@@ -156,24 +159,37 @@ main(int argc, char **argv)
-   setlocale(LC_ALL,"");
-   setlocale(LC_NUMERIC,"C");
-   djvu_programname(argv[0]);
--  GArray<GUTF8String> dargv(0,argc-1);
-+  // get output file name
-+  if (argc>2 && !strcmp(argv[1],"-o"))
-+    {
-+      outputfile = argv[2];
-+      argv += 2;
-+      argc -= 2;
-+    }
-+  // convert iff file name
-+  GArray<GUTF8String> dargv(0, argc-1);
-   for(int i=0;i<argc;++i)
-     dargv[i]=GNativeString(argv[i]);
-+  if (argc <= 1)
-+    usage();
-+  if (outputfile && !(outputf = fopen(outputfile,"w")))
-+    {
-+      DjVuPrintErrorUTF8("djvudump: Cannot open output file.\n");
-+      exit(1);
-+    }
-   G_TRY
-     {
--      if (argc<=1)
--        usage();
-       for (int i=1; i<argc; i++)
--      {
-+        {
-         const GURL::Filename::UTF8 url(dargv[i]);
-         display(url);
--      }
-+        }
-     }
-   G_CATCH(ex)
--    {
-+  {
-       ex.perror();
-       exit(1);
--    }
-+  }
-   G_ENDCATCH;
-   return 0;
- }
--- 
-1.7.4.1
-
-From 6db359d1ad5e7e863fac53301e7ff884cfe44423 Mon Sep 17 00:00:00 2001
-From: Bill C Riemers <briemers@redhat.com>
-Date: Thu, 2 Jun 2011 13:17:27 -0400
-Subject: [PATCH] Correct error copying an error in the annotation class of assigning a tempory
- GUTF8String directly to a const char *.
-
----
- libdjvu/DjVuAnno.cpp |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
-index 6ca5b4e..e2a9108 100644
---- a/libdjvu/DjVuAnno.cpp
-+++ b/libdjvu/DjVuAnno.cpp
-@@ -261,7 +261,8 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
-     to_print=buffer.format("%d",number);
-     break;
-   case STRING:
--    to_print=make_c_string(string);
-+    buffer=make_c_string(string);
-+    to_print=(const char *)buffer;
-     break;
-   case SYMBOL:
-     to_print=buffer.format("%s",(const char *)symbol);
--- 
-1.7.4.1
-
-From 2b26415c3c46ffb7532ca250990668564be62d39 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 2 Jun 2011 09:48:49 -0700
-Subject: [PATCH] Corrected polarity of xmp annotation saving
-
----
- libdjvu/DjVuAnno.cpp |   19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
-index e2a9108..8e16dd8 100644
---- a/libdjvu/DjVuAnno.cpp
-+++ b/libdjvu/DjVuAnno.cpp
-@@ -254,25 +254,24 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
-   if (!cur_pos) { cur_pos = &local_cur_pos; }
-   
-   GUTF8String buffer;
--  const char * to_print=0;
-   switch(type)
-   {
-   case NUMBER:
--    to_print=buffer.format("%d",number);
-+    buffer.format("%d",number);
-     break;
-   case STRING:
--    buffer=make_c_string(string);
--    to_print=(const char *)buffer;
-+    buffer = make_c_string(string);
-     break;
-   case SYMBOL:
--    to_print=buffer.format("%s",(const char *)symbol);
-+    buffer.format("%s",(const char *)symbol);
-     break;
-   case LIST:
--    to_print=buffer.format("(%s",(const char *)name);
-+    buffer.format("(%s",(const char *)name);
-     break;
-   case INVALID:
-     break;
-   }
-+  const char * to_print = (const char*)buffer;
-   if (!compact && *cur_pos+strlen(to_print)>70)
-   {
-     char ch='\n';
-@@ -1375,7 +1374,7 @@ DjVuANT::encode_raw(void) const
-      }
-       //*** XMP Metadata
-    del_all_items(XMP_TAG, parser);
--   if (!xmpmetadata)
-+   if (!!xmpmetadata)
-      {
-        GUTF8String mdatabuffer("(");
-        mdatabuffer +=  XMP_TAG;
-@@ -1385,8 +1384,10 @@ DjVuANT::encode_raw(void) const
-      //*** Mapareas
-    del_all_items(GMapArea::MAPAREA_TAG, parser);
-    for(GPosition pos=map_areas;pos;++pos)
--      parser.parse(map_areas[pos]->print());
--
-+     {
-+       GUTF8String mapareabuffer = map_areas[pos]->print();
-+       parser.parse(mapareabuffer);
-+     }
-    GP<ByteStream> gstr=ByteStream::create();
-    ByteStream &str=*gstr;
-    parser.print(str, 1);
--- 
-1.7.4.1
-
-From 65600b5801d11ff8ca8db3a25bf004fc06f4515b Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sat, 4 Jun 2011 15:29:18 -0700
-Subject: [PATCH] Eliminate warnings with gcc-4.6.0
-
----
- libdjvu/Arrays.cpp        |    2 -
- libdjvu/DjVuDocEditor.cpp |   37 +++++++++----------
- libdjvu/GString.cpp       |   44 ++++++++--------------
- libdjvu/JPEGDecoder.cpp   |    2 -
- libdjvu/XMLParser.cpp     |    7 +---
- tools/ddjvu.cpp           |    2 +-
- tools/jb2cmp/patterns.cpp |   87 +-------------------------------------------
- tools/tiff2pdf.c          |    9 ++---
- 8 files changed, 40 insertions(+), 150 deletions(-)
-
-diff --git a/libdjvu/Arrays.cpp b/libdjvu/Arrays.cpp
-index c4f74ca..6c7f23a 100644
---- a/libdjvu/Arrays.cpp
-+++ b/libdjvu/Arrays.cpp
-@@ -239,9 +239,7 @@ ArrayRep::ins(int n, const void * what, unsigned int howmany)
-       copy(ndata, lobound-minlo, hibound-minlo,
- 	   data, lobound-minlo, hibound-minlo);
-       destroy(data, lobound-minlo, hibound-minlo);
--      void *tmp=data;
-       data=ndata;
--      tmp=data;
-       maxhi = nmaxhi;
-    }
- 
-diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
-index 2247e40..f1d8b0d 100644
---- a/libdjvu/DjVuDocEditor.cpp
-+++ b/libdjvu/DjVuDocEditor.cpp
-@@ -555,27 +555,24 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
-                                          can_compress_flag);
-   }
- 
--         // Oh. It does exist... Check that it has IFF structure
-+  // Oh. It does exist... Check that it has IFF structure
-   {
--       const GP<IFFByteStream> giff(
--         IFFByteStream::create(file_pool->get_stream()));
--       IFFByteStream &iff=*giff;
--       GUTF8String chkid;
--
--       int length;
--       length=iff.get_chunk(chkid);
--       if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
--         chkid!="FORM:BM44" && chkid!="FORM:PM44")
--       G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"+file_url.get_string());
--
--       // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
--       // If NDIR chunk is found, ignore the file
--       while(iff.get_chunk(chkid))
--       {
--         if (chkid=="NDIR")
--           return false;
--         iff.close_chunk();
--       }
-+    const GP<IFFByteStream> giff(
-+       IFFByteStream::create(file_pool->get_stream()));
-+    IFFByteStream &iff=*giff;
-+    GUTF8String chkid;
-+    if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
-+        chkid!="FORM:BM44" && chkid!="FORM:PM44")
-+      G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
-+               + file_url.get_string());
-+    // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
-+    // If NDIR chunk is found, ignore the file
-+    while(iff.get_chunk(chkid))
-+      {
-+        if (chkid=="NDIR")
-+          return false;
-+        iff.close_chunk();
-+      }
-   }
-   return insert_file(file_pool,file_url,is_page,file_pos,name2id,source);
- }
-diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
-index 350b11b..ed92a7f 100644
---- a/libdjvu/GString.cpp
-+++ b/libdjvu/GString.cpp
-@@ -643,26 +643,22 @@ GBaseString::UTF8ToNative(
-   const char *source=(*this);
-   GP<GStringRep> retval;
-   if(source && source[0]) 
--  {
--#if DO_CHANGELOCALE
--    GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
--#endif
--    bool repeat;
--    for(repeat=!currentlocale;;repeat=false)
-     {
--      retval=(*this)->toNative((GStringRep::EscapeMode)escape);
- #if DO_CHANGELOCALE
--      if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
-+      GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
-+      bool repeat;
-+      for(repeat=!currentlocale;;repeat=false)
-+        {
- #endif
--        break;
--    }
-+          retval=(*this)->toNative((GStringRep::EscapeMode)escape);
- #if DO_CHANGELOCALE
--    if(!repeat)
--      {
-+          if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
-+            break;
-+        }
-+      if(!repeat)
-         setlocale(LC_CTYPE,(const char *)lc_ctype);
--      }
- #endif
--  }
-+    }
-   return GNativeString(retval);
- }
- 
-@@ -697,27 +693,19 @@ GBaseString::NativeToUTF8(void) const
-     const char *source=(*this);
- #if DO_CHANGELOCALE
-     GUTF8String lc_ctype=setlocale(LC_CTYPE,0);
--#endif
-     bool repeat;
-     for(repeat=true;;repeat=false)
--    {
--      if( (retval=GStringRep::NativeToUTF8(source)) )
-       {
--        if(GStringRep::cmp(retval->toNative(),source))
--        {
--          retval=GStringRep::UTF8::create((unsigned int)0);
--        }
--      }
--#if DO_CHANGELOCALE
--      if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
- #endif
--        break;
--    }
-+        if( (retval=GStringRep::NativeToUTF8(source)) )
-+          if(GStringRep::cmp(retval->toNative(),source))
-+            retval=GStringRep::UTF8::create((unsigned int)0);
- #if DO_CHANGELOCALE
-+        if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
-+          break;
-+      }
-     if(!repeat)
--    {
-       setlocale(LC_CTYPE,(const char *)lc_ctype);
--    }
- #endif
-   }
-   return GUTF8String(retval);
-diff --git a/libdjvu/JPEGDecoder.cpp b/libdjvu/JPEGDecoder.cpp
-index cb7aa97..f22f77a 100644
---- a/libdjvu/JPEGDecoder.cpp
-+++ b/libdjvu/JPEGDecoder.cpp
-@@ -153,7 +153,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
- 
-   JSAMPARRAY buffer;    /* Output row buffer */
-   int row_stride;   /* physical row width in output buffer */
--  int full_buf_size;
-   int isGrey,i;
- 
-   cinfo.err = jpeg_std_error(&jerr.pub);
-@@ -184,7 +183,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
- 
-   /* JSAMPLEs per row in output buffer */
-   row_stride = cinfo.output_width * cinfo.output_components;
--  full_buf_size = row_stride * cinfo.output_height;
- 
-   /* Make a one-row-high sample array that will go away when done with image */
-   buffer = (*cinfo.mem->alloc_sarray)
-diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
-index 7da923a..026b27d 100644
---- a/libdjvu/XMLParser.cpp
-+++ b/libdjvu/XMLParser.cpp
-@@ -646,17 +646,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags, GURL *pdjvufile)
-     GPosition datapos=args.contains("data");
-     if(datapos)
-     {
--      bool isDjVuType=false;
-       GPosition typePos(args.contains("type"));
-       if(typePos)
--      {
--        if(args[typePos] != mimetype)
-         {
--          // DjVuPrintErrorUTF8("Ignoring %s Object tag\n",mimetype);
-+          if(args[typePos] != mimetype)
-           continue;
-         }
--        isDjVuType=true;
--      }
-       const GURL url = (pdjvufile) ? *pdjvufile 
-         : GURL::UTF8(args[datapos], 
-                      (args[datapos][0] == '/') ? codebase.base() : codebase);
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index b9cb038..3b4ce16 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -855,7 +855,7 @@ parse_option(int argc, char **argv, int i)
-         die(i18n(errarg), opt);
-       flag_verbose = 1;
-     }
--  if (!strcmp(opt,"skip"))
-+  else if (!strcmp(opt,"skip"))
-     {
-       if (arg) 
-         die(i18n(errarg), opt);
-diff --git a/tools/jb2cmp/patterns.cpp b/tools/jb2cmp/patterns.cpp
-index e456902..b31cf4e 100644
---- a/tools/jb2cmp/patterns.cpp
-+++ b/tools/jb2cmp/patterns.cpp
-@@ -303,11 +303,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
-     int32 (*compare_row)(byte *, byte *, int32),
-     int32 (*compare_with_white)(byte *, int32), int32 ceiling)
- {
--    byte **p1, **p2;
-     int32 w1, w2, h1, h2;
-     int32 shift_x, shift_y; /* of i1's coordinate system with respect to i2 */
--    /*int32 s = 0, i, i_start, i_cap;
--    int32 right_margin_start, right_margin_width;*/
- 
-     /* make i1 to be narrower than i2 */
-     if (i1->width > i2->width)
-@@ -317,8 +314,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
-         i2 = img;
-     }
- 
--    w1 = i1->width; h1 = i1->height; p1 = i1->pixels;
--    w2 = i2->width; h2 = i2->height; p2 = i2->pixels;
-+    w1 = i1->width; h1 = i1->height;
-+    w2 = i2->width; h2 = i2->height; 
- 
-     /* (shift_x, shift_y) */
-     /*     is what should be added to i1's coordinates to get i2's coordinates. */
-@@ -339,86 +336,6 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
- 
-     return distance_by_pixeldiff_functions_by_shift(
-         i1, i2, compare_row, compare_with_white, ceiling, shift_x, shift_y);
--
--/* FIXME */
--#if 0
--    /* Compute difference in the non-overlapping top margin */
--
--    if (shift_y < 0)
--    {
--        /* i1 has top rows not covered by i2 */
--        i_cap = -shift_y;
--        for (i = 0; i < i_cap; i++)
--        {
--            assert(i >= 0 && i < h1);
--            s += compare_with_white(p1[i], w1);
--            if (s > ceiling) return maxint;
--        }
--        i_start = i_cap; /* topmost overlapping row in i1's coords */
--    }
--    else
--    {
--        /* i2 has top rows not covered by i1 */
--        for (i = 0; i < shift_y; i++)
--        {
--            assert(i >= 0 && i < h2);
--            s += compare_with_white(p2[i], w2);
--            if (s > ceiling) return maxint;
--        }
--        i_start = 0;
--    }
--
--    /* Compute difference in the overlapping area */
--
--    i_cap = h2 - shift_y;
--    if (h1 < i_cap) i_cap = h1;
--
--    right_margin_start = shift_x + w1;
--    right_margin_width = w2 - right_margin_start;
--
--    for (i = i_start; i < i_cap; i++) /* i is a coordinate in i1 system */
--    {
--        int32 y = i + shift_y; /* same row coordinate in i2 system */
--        assert(y >= 0 && y < h2);
--        s += compare_with_white(p2[y], shift_x);
--        if (s > ceiling) return maxint;
--        assert(i >= 0 && i < h1);
--        assert(shift_x + w1 <= w2);
--        assert(i < h1);
--        s += compare_row(p2[y] + shift_x, p1[i], w1);
--        if (s > ceiling) return maxint;
--        s += compare_with_white(p2[y] + right_margin_start, right_margin_width);
--        if (s > ceiling) return maxint;
--    }
--
--
--    /* Compute difference in the non-overlapping bottom margin */
--
--    if (i_cap == h1)
--    {
--        /* i2 has bottom rows not covered by i1 */
--        i_start = i_cap + shift_y;
--        for (i = i_start; i < h2; i++)
--        {
--            assert(i >= 0 && i < h2);
--            s += compare_with_white(p2[i], w2);
--            if (s > ceiling) return maxint;
--        }
--    }
--    else
--    {
--        /* i1 has bottom rows not covered by i2 */
--        i_start = i_cap;
--        for (i = i_cap; i < h1; i++)
--        {
--            assert(i >= 0 && i < h1);
--            s += compare_with_white(p1[i], w1);
--            if (s > ceiling) return maxint;
--        }
--    }
--
--    return s;
--#endif
- }
- 
- #endif
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index 36949f1..2db8703 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -721,7 +721,6 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
-   const char *outfilename = "<null>";
-   T2P *t2p = NULL;
-   TIFF *output = NULL;
--  tsize_t written=0;
-   int c;
- 
-   /* T2P */
-@@ -874,7 +873,7 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
-   TIFFSeekFile(output, (toff_t) 0, SEEK_SET);
- 
-   /* Write */
--  written = t2p_write_pdf(t2p, input, output);
-+  t2p_write_pdf(t2p, input, output);
-   if(t2p->t2p_error != 0){
-     TIFFError(TIFF2PDF_MODULE, "An error occurred creating output PDF file");
-     goto fail;
-@@ -2633,7 +2632,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output,
- 	tsize_t read=0;
- 	uint16 i=0;
- 	ttile_t tilecount=0;
--	tsize_t tilesize=0;
- 	ttile_t septilecount=0;
- 	tsize_t septilesize=0;
- #ifdef JPEG_SUPPORT
-@@ -2819,7 +2817,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output,
- 		if(t2p->pdf_sample == T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG){
- 			septilesize=TIFFTileSize(input);
- 			septilecount=TIFFNumberOfTiles(input);
--			tilesize=septilesize*t2p->tiff_samplesperpixel;
- 			tilecount=septilecount/t2p->tiff_samplesperpixel;
- 			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
- 			if(buffer==NULL){
-@@ -3802,7 +3799,6 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
- 	tsize_t written=0;
- 	char* info;
- 	char buffer[512];
--	int buflen=0;
- 	
- 	if(t2p->pdf_datetime==NULL){
- 		t2p_pdf_tifftime(t2p, input);
-@@ -3815,7 +3811,8 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
- 	}
- 	written += TIFFWriteFile(output, (tdata_t) "\r/Producer ", 11);
- 	_TIFFmemset((tdata_t)buffer, 0x00, 512);
--	buflen=sprintf(buffer, "libtiff / tiff2pdf - %d / %s", TIFFLIB_VERSION, T2P_VERSION);
-+	sprintf(buffer, "libtiff / tiff2pdf - %d / %s", 
-+                TIFFLIB_VERSION, T2P_VERSION);
- 	written += t2p_write_pdf_string(buffer, output);
- 	written += TIFFWriteFile(output, (tdata_t) "\r", 1);
- 	if(t2p->pdf_creator != NULL){ 
--- 
-1.7.4.1
-
-From 5b3d074c2b315e7339ce279c559c3a99f26bef6a Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sat, 4 Jun 2011 17:37:00 -0700
-Subject: [PATCH] Fix MMX code when using gcc-4.6
-
-Fix MMX macros
-Enable MMX on x86_64
----
- libdjvu/MMX.cpp |   17 ++++++++++++++++-
- libdjvu/MMX.h   |   11 ++++++-----
- tools/ddjvu.cpp |    1 -
- 3 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
-index 528dab6..e70fdd8 100644
---- a/libdjvu/MMX.cpp
-+++ b/libdjvu/MMX.cpp
-@@ -167,8 +167,23 @@ MMXControl::enable_mmx()
-                     : "=m" (cpuflags) :
-                     : "eax","ecx","edx");
- #endif
-+#if defined(MMX) && defined(__GNUC__) && defined(__x86_64__)
-+  // Detection of MMX for GCC
-+  __asm__ volatile (// Check that CR0:EM is clear
-+                    "xorl %%edx,%%edx\n\t"
-+                    "smsw %%ax\n\t"
-+                    "andl $4,%%eax\n\t"
-+                    "jnz 1f\n\t"
-+                    // Execute CPUID
-+                    "movl $1,%%eax\n\t"
-+                    "cpuid\n"
-+                    // Finish
-+		    "1:\tmovl %%edx, %0"
-+                    : "=m" (cpuflags) :
-+                    : "eax","ebx","ecx","edx");
-+#endif
- #if defined(MMX) && defined(_MSC_VER) && defined(_M_IX86)
--  // Detection of MMX for MSVC
-+  // Detection of MMX for MSVC 32 bits
-   __asm {  pushfd
-            pop     ecx
-            xor     edx,edx
-diff --git a/libdjvu/MMX.h b/libdjvu/MMX.h
-index b0af5e5..f8780af 100644
---- a/libdjvu/MMX.h
-+++ b/libdjvu/MMX.h
-@@ -143,17 +143,18 @@ class MMXControl
- 
- #ifndef NO_MMX
- 
--#if defined(__GNUC__) && defined(__i386__)
-+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-+typedef struct{ char c[8]; } MMX_t;
- #define MMXemms \
-   __asm__ volatile("emms" : : : "memory" ) 
- #define MMXrr(op,src,dst) \
--  __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory") 
-+  __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory" ) 
- #define MMXir(op,imm,dst) \
--  __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory") 
-+  __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory" )
- #define MMXar(op,addr,dst) \
--  __asm__ volatile( #op " %0,%%" #dst : : "m" (*(addr)) : "memory") 
-+  __asm__ volatile( #op " %0,%%" #dst : : "m" (*(MMX_t*)(addr)) : "memory" ) 
- #define MMXra(op,src,addr) \
--  __asm__ volatile( #op " %%" #src ",%0" : : "m" (*(addr)) : "memory") 
-+  __asm__ volatile( #op " %%" #src ",%0" : "=m" (*(MMX_t*)(addr)) : : "memory") 
- #define MMX 1
- #endif
- 
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 3b4ce16..216c6cb 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -846,7 +846,6 @@ parse_option(int argc, char **argv, int i)
-       arg = opt;
-       opt = "subsample";
-     }
--  
-   /* Parse options */
-   if (!strcmp(opt,"v") ||
-       !strcmp(opt,"verbose"))
--- 
-1.7.4.1
-
-From fbed8e51e5970b12ce36afb0dec8c4e02992c0f8 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 9 Jun 2011 14:37:52 -0700
-Subject: [PATCH] Fixed regression in djvm.
-
----
- libdjvu/DjVuDocEditor.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
-index f1d8b0d..baeb7dd 100644
---- a/libdjvu/DjVuDocEditor.cpp
-+++ b/libdjvu/DjVuDocEditor.cpp
-@@ -561,6 +561,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
-        IFFByteStream::create(file_pool->get_stream()));
-     IFFByteStream &iff=*giff;
-     GUTF8String chkid;
-+    iff.get_chunk(chkid);
-     if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
-         chkid!="FORM:BM44" && chkid!="FORM:PM44")
-       G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
--- 
-1.7.4.1
-
-From f63327438954b8831a1a9f43afc8b6d16e1d3baf Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Wed, 15 Jun 2011 00:05:50 -0700
-Subject: [PATCH] Encode oblique text as separate lines.
-
----
- tools/csepdjvu.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
-index d5203d5..08f7a27 100644
---- a/tools/csepdjvu.cpp
-+++ b/tools/csepdjvu.cpp
-@@ -1288,7 +1288,7 @@ Comments::textmark(GP<TxtMark> mark)
-       int shx = (mark->x - lastx) * 100 / fontsize;
-       int shy = (mark->y - lasty) * 100 / fontsize;
-       int inter = dirx * shx + diry * shy;
--      if ( (dirx == lastdirx) && (diry == lastdiry) &&
-+      if ( (dirx || diry) && (dirx == lastdirx) && (diry == lastdiry) &&
-            (inter > -150) && (inter < 300) && 
-            abs(diry * shx + dirx * shy) < 80 )
-         mark->inter = inter;
--- 
-1.7.4.1
-
-From ea9fd2acab2e298ba721eb79f5026d34e6ef141f Mon Sep 17 00:00:00 2001
-From: Barak A. Pearlmutter <barak+git@cs.nuim.ie>
-Date: Wed, 22 Jun 2011 11:21:41 +0100
-Subject: [PATCH] consistent prototype for ddjvu_anno_get_xmp
-
----
- libdjvu/ddjvuapi.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
-index 841f223..14b63eb 100644
---- a/libdjvu/ddjvuapi.h
-+++ b/libdjvu/ddjvuapi.h
-@@ -1619,7 +1619,7 @@ ddjvu_anno_get_metadata(miniexp_t annotations, miniexp_t key);
-    Returns zero if no such key is present. */
- 
- DDJVUAPI const char *
--ddjvu_anno_get_xmp(miniexp_t annotations, miniexp_t xmp);
-+ddjvu_anno_get_xmp(miniexp_t annotations);
- 
- 
- /* -------------------------------------------------- */
--- 
-1.7.4.1
-
-From 701d1261493e175955aac97921949f4e4241750d Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sun, 11 Sep 2011 09:59:26 -0700
-Subject: [PATCH] Fixed typo in man page.
-
----
- tools/ddjvu.1 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
-index 7d3d105..cbb8307 100644
---- a/tools/ddjvu.1
-+++ b/tools/ddjvu.1
-@@ -66,7 +66,7 @@ and
- .BR "ppm"
- respectively produce a Portable Bitmap (PBM),
- Portable Graymap (PGM),
--or Portable Pixmap (PGM) file.
-+or Portable Pixmap (PPM) file.
- Format 
- .B "pnm"
- produces a PBM, PGM, or PPM 
--- 
-1.7.4.1
-
diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD
deleted file mode 100644
index 849754c1e..000000000
--- a/staging/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 146985 2012-01-19 22:25:27Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="DVD authoring tools"
-arch=('i686' 'x86_64')
-url="http://dvdauthor.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'dvdauthor-0.7.0-libpng15.patch')
-md5sums=('33a447fb98ab3293ac40f869eedc17ff'
-         '9ea90bbea6adb0469c8c1b2f7d033f11')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb636380..000000000
--- a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff --git a/staging/emacs/PKGBUILD b/staging/emacs/PKGBUILD
deleted file mode 100644
index ec5d8568e..000000000
--- a/staging/emacs/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 147096 2012-01-21 21:55:38Z eric $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
-
-pkgname=emacs
-_majorver=23.3
-_minorver=b
-# We want something like "23.3.a" so pacman version comparison works, but
-# upstream uses "23.3a", which is a bit silly and interpreted as alpha.
-pkgver=$_majorver.$_minorver
-_realver=$_majorver$_minorver
-pkgrel=2
-pkgdesc="The extensible, customizable, self-documenting real-time display editor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/emacs/emacs.html"
-license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
-install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.bz2{,.sig} emacs-subversion17.patch)
-md5sums=('917ce0054ef63773078a6e99b55df1ee'
-         '4f987fbb906c0ee73e05904b0f7ce5ec'
-         '12e2e7a66df5cc5ded54e1d30083a1fb')
-
-build() {
-  cd "$srcdir"/$pkgname-$_majorver
-  patch -p1 -i ../emacs-subversion17.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk --with-xft
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$_majorver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
-  # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
-  # fix perms on /var/games
-  chmod 775 "$pkgdir"/var/games
-  chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
-  chown -R root:games "$pkgdir"/var/games
-}
diff --git a/staging/emacs/emacs-subversion17.patch b/staging/emacs/emacs-subversion17.patch
deleted file mode 100644
index e7969de81..000000000
--- a/staging/emacs/emacs-subversion17.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001
-From: Karl Pflästerer <k@rl.pflaesterer.de>
-Date: Sat, 12 Feb 2011 01:12:53 +0000
-Subject: Adapt to Subversion change, with no .svn directory in each sub directory.
-
-http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html
-
-* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root.
-(vc-svn-root): New function.  Make vc-svn-responsible-p an alias.
-(vc-svn-repository-hostname): Use "svn info".
----
-(limited to 'lisp/vc/vc-svn.el')
-
-diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
-index aefef50..20c7689 100644
---- a/lisp/vc-svn.el
-+++ b/lisp/vc-svn.el
-@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t."
- ;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
- ;;;###autoload                           "_svn")
- ;;;###autoload                          (t ".svn"))))
--;;;###autoload     (when (file-readable-p (expand-file-name
--;;;###autoload                             (concat admin-dir "/entries")
--;;;###autoload                             (file-name-directory f)))
-+;;;###autoload     (when (vc-find-root f admin-dir)
- ;;;###autoload       (load "vc-svn")
- ;;;###autoload       (vc-svn-registered f))))
- 
- (defun vc-svn-registered (file)
-   "Check if FILE is SVN registered."
--  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
--						   "/entries")
--					   (file-name-directory file)))
-+  (when (vc-svn-root file)
-     (with-temp-buffer
-       (cd (file-name-directory file))
-       (let* (process-file-side-effects
-@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches'
- to the SVN command."
-   (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
- 
--(defun vc-svn-responsible-p (file)
--  "Return non-nil if SVN thinks it is responsible for FILE."
--  (file-directory-p (expand-file-name vc-svn-admin-directory
--				      (if (file-directory-p file)
--					  file
--					(file-name-directory file)))))
-+(defun vc-svn-root (file)
-+  (vc-find-root file vc-svn-admin-directory))
- 
--(defalias 'vc-svn-could-register 'vc-svn-responsible-p
-+(defalias 'vc-svn-responsible-p 'vc-svn-root)
-+
-+(defalias 'vc-svn-could-register 'vc-svn-root
-   "Return non-nil if FILE could be registered in SVN.
- This is only possible if SVN is responsible for FILE's directory.")
- 
-@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
- 
- (defun vc-svn-repository-hostname (dirname)
-   (with-temp-buffer
--    (let ((coding-system-for-read
--	   (or file-name-coding-system
--	       default-file-name-coding-system)))
--      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
--						"/entries")
--					dirname)))
-+    (let (process-file-side-effects)
-+      (vc-svn-command t t dirname "info" "--xml"))
-     (goto-char (point-min))
--    (when (re-search-forward
--	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
--	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
--		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
--		   "url=\"\\(?1:[^\"]+\\)\""
--                   ;; Yet newer ones don't use XML any more.
--                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
-+    (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
-       ;; This is not a hostname but a URL.  This may actually be considered
-       ;; as a feature since it allows vc-svn-stay-local to specify different
-       ;; behavior for different modules on the same server.
---
-cgit v0.9.0.2
diff --git a/staging/emacs/emacs.install b/staging/emacs/emacs.install
deleted file mode 100644
index d84f1de14..000000000
--- a/staging/emacs/emacs.install
+++ /dev/null
@@ -1,32 +0,0 @@
-ICON_PATH=usr/share/icons/hicolor
-INFO_DIR=usr/share/info
-
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
diff --git a/staging/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD
deleted file mode 100644
index b8e04522a..000000000
--- a/staging/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 146965 2012-01-19 18:31:50Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=5
-pkgdesc="Intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
-makedepends=('boost')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
-        libpng-1.4.patch enblend-4.0-libpng15.patch)
-sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
-          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
-          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
-          '71e961d90be842eafe9d473d8d70b04b29077036')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
-  patch -p1 -i ../libpng-1.4.patch
-  patch -p0 -i ../enblend-4.0-libpng15.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
-  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
-}
diff --git a/staging/enblend-enfuse/enblend-4.0-libpng15.patch b/staging/enblend-enfuse/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465ccad..000000000
--- a/staging/enblend-enfuse/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
--    longjmp( png_ptr->jmpbuf, 1 );
-+    longjmp( png_jmpbuf( png_ptr ), 1 );
- }
- 
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -221,14 +221,14 @@
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -244,13 +244,13 @@
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-             png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-@@ -283,7 +283,7 @@
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
- 
-         // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
--        char * dummyName;
-+        png_charpp dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytepp profilePtr;
-         png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
--            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-         }
-@@ -340,7 +340,7 @@
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -349,26 +349,26 @@
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -379,7 +379,7 @@
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -545,7 +545,7 @@
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -556,7 +556,7 @@
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -571,7 +571,7 @@
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -597,12 +597,12 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, "icc", 0,
--                         (char *)iccProfile.begin(), iccProfile.size());
-+                         iccProfile.begin(), iccProfile.size());
-         }
- #endif
- 
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -634,10 +634,10 @@
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }
diff --git a/staging/enblend-enfuse/enblend-enfuse.install b/staging/enblend-enfuse/enblend-enfuse.install
deleted file mode 100644
index 24ea28a4e..000000000
--- a/staging/enblend-enfuse/enblend-enfuse.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(enblend.info enfuse.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/enblend-enfuse/libpng-1.4.patch b/staging/enblend-enfuse/libpng-1.4.patch
deleted file mode 100644
index 3bf852b58..000000000
--- a/staging/enblend-enfuse/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
-+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
-@@ -275,8 +275,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD
deleted file mode 100644
index 3920b1772..000000000
--- a/staging/evince/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 147248 2012-01-25 02:33:36Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.2.1
-pkgrel=3
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/evince/evince.install b/staging/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/staging/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall evince
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD
deleted file mode 100644
index b49dbed88..000000000
--- a/staging/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 145813 2012-01-02 10:05:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.2.2
-pkgrel=2
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD
deleted file mode 100644
index 14d003a4d..000000000
--- a/staging/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 145815 2012-01-02 10:16:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.2.1
-pkgrel=2
-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=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/staging/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/staging/evolution-groupwise/PKGBUILD b/staging/evolution-groupwise/PKGBUILD
deleted file mode 100644
index a5f6a12cc..000000000
--- a/staging/evolution-groupwise/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 145817 2012-01-02 10:20:33Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=evolution-groupwise
-pkgver=3.2.1
-pkgrel=2
-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/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/staging/fbida/PKGBUILD b/staging/fbida/PKGBUILD
deleted file mode 100644
index c7fa1f6d6..000000000
--- a/staging/fbida/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146887 2012-01-19 03:44:47Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fbida
-pkgver=2.08
-pkgrel=2
-pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
-arch=('i686' 'x86_64')
-url="http://www.kraxel.org/blog/linux/fbida/"
-license=('GPL2')
-depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl')
-makedepends=('libxpm')
-optdepends=('ghostscript: to use fbgs')
-source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9b3693ab26a58194e36b479bffb61ed0')
-sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/ungif/gif/' GNUmakefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" prefix=/usr install
-}
diff --git a/staging/feh/PKGBUILD b/staging/feh/PKGBUILD
deleted file mode 100644
index 794de592d..000000000
--- a/staging/feh/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146881 2012-01-19 03:22:03Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=feh
-pkgver=2.2
-pkgrel=2
-pkgdesc='Fast and light imlib2-based image viewer'
-url='http://feh.finalrewind.org/'
-license=('MIT')
-arch=('i686' 'x86_64')
-depends=('giblib' 'curl' 'libxinerama')
-optdepends=('perl: feh-cam, webcam wrapper for feh')
-makedepends=('libxt')
-source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PREFIX=/usr
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/ffmpegthumbnailer/PKGBUILD b/staging/ffmpegthumbnailer/PKGBUILD
deleted file mode 100644
index 7cc1baea4..000000000
--- a/staging/ffmpegthumbnailer/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil@gmail.com
-
-pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=3
-pkgdesc="Lightweight video thumbnailer that can be used by file managers."
-url="http://code.google.com/p/ffmpegthumbnailer/"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('ffmpeg' 'libjpeg' 'libpng')
-optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        'ffmpegthumbnailer.desktop')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --enable-gio
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop"
-}
diff --git a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop
deleted file mode 100644
index 79203e5bc..000000000
--- a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=ffmpegthumbnailer
-Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
-MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
diff --git a/staging/fltk/PKGBUILD b/staging/fltk/PKGBUILD
deleted file mode 100644
index 2a830946f..000000000
--- a/staging/fltk/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 146979 2012-01-19 21:29:09Z eric $
-# Maintainer:
-
-pkgbase=fltk
-pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.0
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('custom:LGPL')
-url="http://www.fltk.org/"
-makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
-             'alsa-lib' 'desktop-file-utils')
-source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
-         -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
-  ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  make
-  cd documentation
-  make html
-}
-
-package_fltk() {
-  pkgdesc="Graphical user interface toolkit for X"
-  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
-           'desktop-file-utils' 'xdg-utils')
-  options=('!docs')
-  install=fltk.install
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
-  chmod 644 "$pkgdir"/usr/lib/*.a
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-docs() {
-  pkgdesc="Graphical user interface toolkit for X (documentation)"
-
-  cd "$srcdir/$pkgbase-$pkgver/documentation"
-  install -d "$pkgdir"/usr/share/doc/fltk/
-  for _file in html/* ; do
-    install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
-  done
-  cd ../test
-  make DESTDIR="$pkgdir" install
-  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-games() {
-  pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
-  depends=('alsa-lib' 'fltk')
-  install=fltk-games.install
-
-  cd "$srcdir/$pkgbase-$pkgver/test"
-  make DESTDIR="$pkgdir" install-linux
-  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
-  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/fltk/fltk-games.install b/staging/fltk/fltk-games.install
deleted file mode 100644
index f3fe2b08b..000000000
--- a/staging/fltk/fltk-games.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}
diff --git a/staging/fltk/fltk.install b/staging/fltk/fltk.install
deleted file mode 100644
index f89ec8213..000000000
--- a/staging/fltk/fltk.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}
diff --git a/staging/fontforge/PKGBUILD b/staging/fontforge/PKGBUILD
deleted file mode 100644
index f5dc25f1a..000000000
--- a/staging/fontforge/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 146903 2012-01-19 04:55:00Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=fontforge
-pkgver=20120119
-pkgrel=1
-pkgdesc='Outline and bitmap font editor'
-arch=('i686' 'x86_64')
-url='http://fontforge.sourceforge.net/'
-license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
-options=('!libtool' '!makeflags')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c')
-
-# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -i 's/python /python2 /g' Makefile.dynamic.in
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-type3 \
-		--enable-devicetables \
-		--enable-double \
-		--with-regular-link \
-		--with-python=python2 \
-		--enable-pyextension \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/fvwm/PKGBUILD b/staging/fvwm/PKGBUILD
deleted file mode 100644
index 89af20969..000000000
--- a/staging/fvwm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146983 2012-01-19 22:19:37Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fvwm
-pkgver=2.6.3
-pkgrel=2
-pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
-arch=('i686' 'x86_64')
-url="http://www.fvwm.org"
-license=('GPL' 'custom')
-depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
-makedepends=('libxslt')
-provides=('fvwm-devel')
-conflicts=('fvwm-devel')
-replaces=('fvwm-devel')
-options=('!emptydirs' '!makeflags')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop)
-sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39'
-          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm"
-  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/staging/fvwm/fvwm.desktop b/staging/fvwm/fvwm.desktop
deleted file mode 100644
index e297a6109..000000000
--- a/staging/fvwm/fvwm.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM
-Comment=The fvwm window manager
-Type=XSession
-Exec=/usr/bin/fvwm
-TryExec=/usr/bin/fvwm
diff --git a/staging/gd/PKGBUILD b/staging/gd/PKGBUILD
deleted file mode 100644
index d2c40835a..000000000
--- a/staging/gd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146845 2012-01-18 20:23:55Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=gd
-pkgver=2.0.36RC1
-pkgrel=5
-pkgdesc="Library for the dynamic creation of images by programmers"
-arch=('i686' 'x86_64')
-url="http://www.libgd.org/"
-license=('custom')
-depends=('libpng' 'fontconfig' 'libjpeg')
-optdepends=('perl: bdftogd script')
-options=('!libtool')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'libpng14.patch')
-md5sums=('e876979ca3130623a4e7866d9579171a'
-         '7921556f4960e8d66cf4fb67ea7101b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ${srcdir}/libpng14.patch
-  ./configure --prefix=/usr --without-xpm
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/gd/libpng14.patch b/staging/gd/libpng14.patch
deleted file mode 100644
index 19a3fda91..000000000
--- a/staging/gd/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c
---- gd-2.0.36RC1.orig/gd_png.c	2007-11-27 10:30:34.000000000 +0200
-+++ gd-2.0.36RC1/gd_png.c	2010-01-17 17:14:11.000000000 +0200
-@@ -151,7 +151,7 @@
- 	return NULL;
-   }
- 
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
-     	return NULL;		/* bad signature */
- 	}
- 
diff --git a/staging/gdk-pixbuf2/PKGBUILD b/staging/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index bf38ef13e..000000000
--- a/staging/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146826 2012-01-18 19:45:40Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gdk-pixbuf2
-pkgver=2.24.1
-pkgrel=2
-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/2.24/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
-
-build() {
-  cd "$srcdir/gdk-pixbuf-$pkgver"
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "$srcdir/gdk-pixbuf-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/gdk-pixbuf2/gdk-pixbuf2.install b/staging/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 1b35942cb..000000000
--- a/staging/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/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD
deleted file mode 100644
index 9fecb8b2e..000000000
--- a/staging/gegl/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 146879 2012-01-19 03:20:59Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gegl
-pkgver=0.1.8
-pkgrel=2
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
-optdepends=('openexr: for using the openexr plugin' \
-            'ffmpeg: for using the ffmpeg plugin' \
-            'librsvg: for using the svg plugin' \
-            'jasper: for using the jasper plugin')
-options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gif2png/PKGBUILD b/staging/gif2png/PKGBUILD
deleted file mode 100644
index 2e530eaba..000000000
--- a/staging/gif2png/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 146933 2012-01-19 11:45:57Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Andrew Rose <ody@netrux.com>
-
-pkgname=gif2png
-pkgver=2.5.4
-pkgrel=3
-pkgdesc="A GIF to PNG image format converter"
-arch=('i686' 'x86_64')
-url="http://www.catb.org/~esr/gif2png/"
-license=('ZLIB')
-depends=('libpng')
-optdepends=('python2: for using web2png')
-source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gif2png-2.5.4-libpng15.patch')
-md5sums=('d63ea3fc6b6119589e8d4d6fead30df9'
-         'd4d6d31e04e7448315eae56bb12d4df6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's#env python#env python2#' web2png
-  patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/gif2png/gif2png-2.5.4-libpng15.patch b/staging/gif2png/gif2png-2.5.4-libpng15.patch
deleted file mode 100644
index 9e5c333bb..000000000
--- a/staging/gif2png/gif2png-2.5.4-libpng15.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
-
---- gif2png.c
-+++ gif2png.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>	/* for isatty() */
-+#include <zlib.h>
- 
- #if !defined(TRUE)
- #define FALSE	0
-@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
-     int colors_used = 0;
-     byte remap[MAXCMSIZE];
-     int low_prec;
--    png_struct *png_ptr = xalloc(sizeof (png_struct));
--    png_info *info_ptr = xalloc(sizeof (png_info));
-+    png_struct *png_ptr;
-+    png_info *info_ptr;
-     int p;
-     int gray_bitdepth;
-     png_color pal_rgb[MAXCMSIZE], *pltep;
-@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
-     png_text software;
-     png_text comment;
- 
-+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+    if (png_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+    info_ptr = png_create_info_struct(png_ptr);
-+    if (info_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+
-     /* these volatile declarations prevent gcc warnings ("variable might be
-      *  clobbered by `longjmp' or `vfork'") */
-     volatile int gray = TRUE;
diff --git a/staging/gimp-dbp/PKGBUILD b/staging/gimp-dbp/PKGBUILD
deleted file mode 100644
index 7575150dc..000000000
--- a/staging/gimp-dbp/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 147086 2012-01-21 18:00:41Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-dbp
-pkgver=1.1.9
-pkgrel=3
-pkgdesc="David's batch processor for the GIMP"
-arch=('i686' 'x86_64')
-url="http://members.ozemail.com.au/~hodsond/dbp.html"
-license=('GPL')
-depends=('gimp')
-source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz)
-md5sums=('1106625707798ab8ea1317ac6bece1c5')
-
-build() {
-  cd "${srcdir}/dbp-${pkgver}"
-  sed -i "s|<string>|<cstring>|" op.h
-  make
-}
-
-package() {
-  cd "${srcdir}/dbp-${pkgver}"
-  install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp"
-}
diff --git a/staging/gimp-devel/PKGBUILD b/staging/gimp-devel/PKGBUILD
deleted file mode 100644
index 4f5e74b22..000000000
--- a/staging/gimp-devel/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 147053 2012-01-21 05:38:18Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gimp-devel
-pkgver=2.7.4
-pkgrel=2
-pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64')
-url="http://www.gimp.org/"
-license=('GPL3' 'LGPL3')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
-         'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser or web-page plug-ins'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support')
-options=('!libtool' '!makeflags')
-conflicts=('gimp')
-provides=("gimp=${pkgver}")
-install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('bda95a29c3483b8ff458b06b1543f867'
-         'bb27bc214261d36484093e857f015f38')
-
-build() {
-  cd "${srcdir}/gimp-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-python --with-libcurl \
-    --with-gif-compression=lzw --without-aa --without-gvfs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/gimp-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/gimp-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
-
-  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
-  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-}
diff --git a/staging/gimp-devel/gimp-devel.install b/staging/gimp-devel/gimp-devel.install
deleted file mode 100644
index c317fbaca..000000000
--- a/staging/gimp-devel/gimp-devel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/gimp-devel/linux.gpl b/staging/gimp-devel/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/staging/gimp-devel/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD
deleted file mode 100644
index 229159b5e..000000000
--- a/staging/gimp-ufraw/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147080 2012-01-21 17:07:06Z eric $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=4
-pkgdesc="Standalone or gimp plugin converter for raw files"
-url="http://ufraw.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
-makedepends=('gimp' 'cinepaint')
-optdepends=('gimp: to use the gimp import plugin for raw images'
-            'cinepaint: to use the cinepaint import plugin for raw images')
-install=gimp-ufraw.install
-source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
-sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
-
-build() {
-  cd "${srcdir}/ufraw-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-extras \
-              --enable-mime \
-              --enable-openmp
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/ufraw-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/bin/dcraw"
-}
diff --git a/staging/gimp-ufraw/gimp-ufraw.install b/staging/gimp-ufraw/gimp-ufraw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/gimp-ufraw/gimp-ufraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/gimp/PKGBUILD b/staging/gimp/PKGBUILD
deleted file mode 100644
index 6a95fb2b3..000000000
--- a/staging/gimp/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 147055 2012-01-21 08:27:32Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgname=gimp
-pkgver=2.6.11
-pkgrel=8
-pkgdesc="GNU Image Manipulation Program"
-arch=('i686' 'x86_64')
-url="http://www.gimp.org/"
-license=('GPL' 'LGPL')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support')
-options=('!libtool' '!makeflags')
-conflicts=('gimp-devel')
-install=gimp.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
-        uri-backend-libcurl.patch gimp-poppler-0.18.patch libpng_compile.patch)
-sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c'
-          '110ce9798173b19a662d086ed7b882b4729f06cf'
-          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4'
-          '1479a6d80be7adf74f66a3b88057a5029fe892e8'
-          '5ce329d2e2cb136e93f16117fa79ab6e31866f68')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../uri-backend-libcurl.patch
-  patch -p1 < ../gimp-poppler-0.18.patch
-  patch -p1 < ../libpng_compile.patch
-  PYTHON=/usr/bin/python2 LIBS+="-lgobject-2.0 -lglib-2.0 -lm" \
-    ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-gimp-remote \
-    --enable-python --with-gif-compression=lzw --with-libcurl \
-    --without-aa --without-hal --without-gvfs --without-gnomevfs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  rm "${pkgdir}/usr/share/man/man1/gimp-console.1"
-  ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-}
diff --git a/staging/gimp/gimp-poppler-0.18.patch b/staging/gimp/gimp-poppler-0.18.patch
deleted file mode 100644
index 0715460bc..000000000
--- a/staging/gimp/gimp-poppler-0.18.patch
+++ /dev/null
@@ -1,476 +0,0 @@
-From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Fri, 6 May 2011 11:58:44 +0200
-Subject: [PATCH] patch: poppler-0.17
-
-Squashed commit of the following:
-
-commit 529d940222dfc352d41fbf72de29134421aa4002
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Fri May 6 11:50:30 2011 +0200
-
-    use code based on pixbufs instead of cairo surfaces
-
-    this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for
-    hints how to do this
-
-commit f8671d8767d4cdab830dc06310e96c63a88ec0fd
-Author: Mukund Sivaraman <muks@banu.com>
-Date:   Thu Apr 21 13:57:13 2011 +0530
-
-    file-pdf-load: Update attribution, removing bogus copyright
-    (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019)
-
-commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:52:18 2011 +0200
-
-    file-pdf-load: Use better API + cleanups
-
-    * fixes issues with poppler 0.17 completely
-    * uses new libgimp API to pass surfaces instead of pixbufs
-    * uses GTK+ 3 API to convert surfaces to pixbufs where available
-    (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2)
-
-commit 4e92302c4a14a961f112587a0ad86696c88da2f8
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:38:08 2011 +0200
-
-    file-pdf-load: Don't use deprecated API (bug #646947)
-
-    (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237)
-
-    Conflicts:
-
-    	plug-ins/common/file-pdf.c
----
- plug-ins/common/file-pdf.c |  323 ++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 283 insertions(+), 40 deletions(-)
-
-diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c
-index a43b459..43c2b7d 100644
---- a/plug-ins/common/file-pdf.c
-+++ b/plug-ins/common/file-pdf.c
-@@ -4,6 +4,9 @@
-  *
-  * Copyright (C) 2005 Nathan Summers
-  *
-+ * Some code in render_page_to_surface() borrowed from
-+ * poppler.git/glib/poppler-page.cc.
-+ *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-@@ -80,16 +83,20 @@ static gboolean          load_dialog       (PopplerDocument        *doc,
- static PopplerDocument * open_document     (const gchar            *filename,
-                                             GError                **error);
- 
--static GdkPixbuf *       get_thumbnail     (PopplerDocument        *doc,
-+static cairo_surface_t * get_thumb_surface (PopplerDocument        *doc,
-+                                            gint                    page,
-+                                            gint                    preferred_size);
-+
-+static GdkPixbuf *       get_thumb_pixbuf  (PopplerDocument        *doc,
-                                             gint                    page,
-                                             gint                    preferred_size);
- 
- static gint32            layer_from_pixbuf (gint32                  image,
--                                            const gchar            *layer_name,
--                                            gint                    position,
--                                            GdkPixbuf              *buf,
--                                            gdouble                 progress_start,
--                                            gdouble                 progress_scale);
-+					                        const gchar            *layer_name,
-+					                        gint                    position,
-+					                        GdkPixbuf              *pixbuf,
-+					                        gdouble                 progress_start,
-+					                        gdouble                 progress_scale);
- 
- /**
-  ** the following was formerly part of
-@@ -433,11 +440,12 @@ run (const gchar      *name,
-         }
-       else
-         {
--          gdouble      width  = 0;
--          gdouble      height = 0;
--          gdouble      scale;
--          gint32       image  = -1;
--          GdkPixbuf   *pixbuf = NULL;
-+          gdouble    width     = 0;
-+          gdouble    height    = 0;
-+          gdouble    scale;
-+          gint32     image     = -1;
-+          gint       num_pages = 0;
-+          GdkPixbuf *pixbuf    = NULL;
- 
-           /* Possibly retrieve last settings */
-           gimp_get_data (LOAD_PROC, &loadvals);
-@@ -455,7 +463,10 @@ run (const gchar      *name,
-                   g_object_unref (page);
-                 }
- 
--              pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32);
-+              num_pages = poppler_document_get_n_pages (doc);
-+
-+              pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32);
-+
-               g_object_unref (doc);
-             }
- 
-@@ -548,6 +559,187 @@ open_document (const gchar  *filename,
-   return doc;
- }
- 
-+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */
-+
-+#if (!GTK_CHECK_VERSION (3, 0, 0))
-+
-+static cairo_format_t
-+gdk_cairo_format_for_content (cairo_content_t content)
-+{
-+  switch (content)
-+    {
-+    case CAIRO_CONTENT_COLOR:
-+      return CAIRO_FORMAT_RGB24;
-+    case CAIRO_CONTENT_ALPHA:
-+      return CAIRO_FORMAT_A8;
-+    case CAIRO_CONTENT_COLOR_ALPHA:
-+    default:
-+      return CAIRO_FORMAT_ARGB32;
-+    }
-+}
-+
-+static cairo_surface_t *
-+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
-+                                   cairo_content_t  content,
-+                                   int              src_x,
-+                                   int              src_y,
-+                                   int              width,
-+                                   int              height)
-+{
-+  cairo_surface_t *copy;
-+  cairo_t *cr;
-+
-+  copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
-+                                     width,
-+                                     height);
-+
-+  cr = cairo_create (copy);
-+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+  cairo_set_source_surface (cr, surface, -src_x, -src_y);
-+  cairo_paint (cr);
-+  cairo_destroy (cr);
-+
-+  return copy;
-+}
-+
-+static void
-+convert_alpha (guchar *dest_data,
-+               int     dest_stride,
-+               guchar *src_data,
-+               int     src_stride,
-+               int     src_x,
-+               int     src_y,
-+               int     width,
-+               int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      guint alpha = src[x] >> 24;
-+
-+      if (alpha == 0)
-+        {
-+          dest_data[x * 4 + 0] = 0;
-+          dest_data[x * 4 + 1] = 0;
-+          dest_data[x * 4 + 2] = 0;
-+        }
-+      else
-+        {
-+          dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
-+        }
-+      dest_data[x * 4 + 3] = alpha;
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+static void
-+convert_no_alpha (guchar *dest_data,
-+                  int     dest_stride,
-+                  guchar *src_data,
-+                  int     src_stride,
-+                  int     src_x,
-+                  int     src_y,
-+                  int     width,
-+                  int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      dest_data[x * 3 + 0] = src[x] >> 16;
-+      dest_data[x * 3 + 1] = src[x] >>  8;
-+      dest_data[x * 3 + 2] = src[x];
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+/**
-+ * gdk_pixbuf_get_from_surface:
-+ * @surface: surface to copy from
-+ * @src_x: Source X coordinate within @surface
-+ * @src_y: Source Y coordinate within @surface
-+ * @width: Width in pixels of region to get
-+ * @height: Height in pixels of region to get
-+ *
-+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
-+ * representation inside a #GdkPixbuf. This allows you to efficiently read
-+ * individual pixels from cairo surfaces. For #GdkWindows, use
-+ * gdk_pixbuf_get_from_window() instead.
-+ *
-+ * This function will create an RGB pixbuf with 8 bits per channel.
-+ * The pixbuf will contain an alpha channel if the @surface contains one.
-+ *
-+ * Return value: (transfer full): A newly-created pixbuf with a reference
-+ *     count of 1, or %NULL on error
-+ */
-+static GdkPixbuf *
-+gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
-+                              gint             src_x,
-+                              gint             src_y,
-+                              gint             width,
-+                              gint             height)
-+{
-+  cairo_content_t content;
-+  GdkPixbuf *dest;
-+
-+  /* General sanity checks */
-+  g_return_val_if_fail (surface != NULL, NULL);
-+  g_return_val_if_fail (width > 0 && height > 0, NULL);
-+
-+  content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR;
-+  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-+                         !!(content & CAIRO_CONTENT_ALPHA),
-+                         8,
-+                         width, height);
-+
-+  surface = gdk_cairo_surface_coerce_to_image (surface, content,
-+                                               src_x, src_y,
-+                                               width, height);
-+  cairo_surface_flush (surface);
-+  if (cairo_surface_status (surface) || dest == NULL)
-+    {
-+      cairo_surface_destroy (surface);
-+      return NULL;
-+    }
-+
-+  if (gdk_pixbuf_get_has_alpha (dest))
-+    convert_alpha (gdk_pixbuf_get_pixels (dest),
-+                   gdk_pixbuf_get_rowstride (dest),
-+                   cairo_image_surface_get_data (surface),
-+                   cairo_image_surface_get_stride (surface),
-+                   0, 0,
-+                   width, height);
-+  else
-+    convert_no_alpha (gdk_pixbuf_get_pixels (dest),
-+                      gdk_pixbuf_get_rowstride (dest),
-+                      cairo_image_surface_get_data (surface),
-+                      cairo_image_surface_get_stride (surface),
-+                      0, 0,
-+                      width, height);
-+
-+  cairo_surface_destroy (surface);
-+  return dest;
-+}
-+
-+#endif
-+
- static gint32
- layer_from_pixbuf (gint32        image,
-                    const gchar  *layer_name,
-@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32        image,
-   return layer;
- }
- 
-+static cairo_surface_t *
-+render_page_to_surface (PopplerPage *page,
-+                        int          width,
-+                        int          height,
-+                        double       scale)
-+{
-+  cairo_surface_t *surface;
-+  cairo_t *cr;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-+  cr = cairo_create (surface);
-+
-+  cairo_save (cr);
-+  cairo_translate (cr, 0.0, 0.0);
-+
-+  if (scale != 1.0)
-+    cairo_scale (cr, scale, scale);
-+
-+  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+render_page_to_pixbuf (PopplerPage *page,
-+                       int          width,
-+                       int          height,
-+                       double       scale)
-+{
-+  GdkPixbuf *pixbuf;
-+  cairo_surface_t *surface;
-+
-+  surface = render_page_to_surface (page, width, height, scale);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-+  return pixbuf;
-+}
-+
- static gint32
- load_image (PopplerDocument        *doc,
-             const gchar            *filename,
-@@ -597,7 +837,7 @@ load_image (PopplerDocument        *doc,
-       gdouble      page_width;
-       gdouble      page_height;
- 
--      GdkPixbuf   *buf;
-+      GdkPixbuf   *pixbuf;
-       gint         width;
-       gint         height;
- 
-@@ -627,15 +867,13 @@ load_image (PopplerDocument        *doc,
-           gimp_image_set_resolution (image_ID, resolution, resolution);
-         }
- 
--      buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
--
--      poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf);
-+      pixbuf = render_page_to_pixbuf (page, width, height, scale);
- 
--      layer_from_pixbuf (image_ID, page_label, i, buf,
-+      layer_from_pixbuf (image_ID, page_label, i, pixbuf,
-                          doc_progress, 1.0 / pages->n_pages);
- 
-       g_free (page_label);
--      g_object_unref (buf);
-+      g_object_unref(pixbuf);
- 
-       doc_progress = (double) (i + 1) / pages->n_pages;
-       gimp_progress_update (doc_progress);
-@@ -676,30 +914,22 @@ load_image (PopplerDocument        *doc,
-   return image_ID;
- }
- 
--static GdkPixbuf *
--get_thumbnail (PopplerDocument *doc,
--               gint             page_num,
--               gint             preferred_size)
-+static cairo_surface_t *
-+get_thumb_surface (PopplerDocument *doc,
-+                   gint             page_num,
-+                   gint             preferred_size)
- {
-   PopplerPage *page;
--  GdkPixbuf   *pixbuf;
-+  cairo_surface_t *surface;
- 
-   page = poppler_document_get_page (doc, page_num);
- 
-   if (! page)
-     return NULL;
- 
--  /* XXX: Remove conditional when we depend on poppler 0.8.0, but also
--   * add configure check to make sure POPPLER_WITH_GDK is enabled!
--   */
--#ifdef POPPLER_WITH_GDK
--  pixbuf = poppler_page_get_thumbnail_pixbuf (page);
--#else
--  pixbuf = poppler_page_get_thumbnail (page);
--#endif
--
-+  surface = poppler_page_get_thumbnail (page);
- 
--  if (! pixbuf)
-+  if (! surface)
-     {
-       gdouble width;
-       gdouble height;
-@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc,
-       width  *= scale;
-       height *= scale;
- 
--      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
--                               width, height);
--
--      poppler_page_render_to_pixbuf (page,
--                                     0, 0, width, height, scale, 0, pixbuf);
-+      surface = render_page_to_surface (page, width, height, scale);
-     }
- 
-   g_object_unref (page);
- 
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+get_thumb_pixbuf (PopplerDocument *doc,
-+                  gint             page_num,
-+                  gint             preferred_size)
-+{
-+  cairo_surface_t *surface;
-+  GdkPixbuf *pixbuf;
-+
-+  surface = get_thumb_surface (doc, page_num, preferred_size);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-   return pixbuf;
- }
- 
-@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data)
-       idle_data->page_no  = i;
- 
-       /* FIXME get preferred size from somewhere? */
--      idle_data->pixbuf = get_thumbnail (thread_data->document, i,
--                                         THUMBNAIL_SIZE);
-+      idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i,
-+                                            THUMBNAIL_SIZE);
- 
-       g_idle_add (idle_set_thumbnail, idle_data);
- 
--- 
-1.7.5
diff --git a/staging/gimp/gimp.install b/staging/gimp/gimp.install
deleted file mode 100644
index c317fbaca..000000000
--- a/staging/gimp/gimp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/gimp/libpng_compile.patch b/staging/gimp/libpng_compile.patch
deleted file mode 100644
index 26d3f9427..000000000
--- a/staging/gimp/libpng_compile.patch
+++ /dev/null
@@ -1,984 +0,0 @@
-Description: fix compilation against libpng 1.5
-Origin: upstream, 2.6 branch, diff of 2917a0e..e7469007
-Bug-Debian: http://bugs.debian.org/649972
-
-diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
-index 29dd155..8054504 100644
---- a/plug-ins/common/file-mng.c
-+++ b/plug-ins/common/file-mng.c
-@@ -136,7 +136,6 @@ struct mng_data_t
-   gint32 default_dispose;
- };
- 
--
- /* Values of the instance of the above struct when the plug-in is
-  * first invoked. */
- 
-@@ -160,6 +159,21 @@ static struct mng_data_t mng_data =
- };
- 
- 
-+/* These are not saved or restored. */
-+
-+struct mng_globals_t
-+{
-+  gboolean   has_trns;
-+  png_bytep  trans;
-+  int        num_trans;
-+  gboolean   has_plte;
-+  png_colorp palette;
-+  int        num_palette;
-+};
-+
-+static struct mng_globals_t mngg;
-+
-+
- /* The output FILE pointer which is used by libmng;
-  * passed around as user data. */
- struct mnglib_userdata_t
-@@ -196,7 +210,8 @@ static gboolean  respin_cmap     (png_structp       png_ptr,
-                                   png_infop         png_info_ptr,
-                                   guchar           *remap,
-                                   gint32            image_id,
--                                  GimpDrawable     *drawable);
-+                                  GimpDrawable     *drawable,
-+                                  int              *bit_depth);
- 
- static gboolean  mng_save_image  (const gchar      *filename,
-                                   gint32            image_id,
-@@ -414,6 +429,18 @@ ia_has_transparent_pixels (guchar *pixels,
-   return FALSE;
- }
- 
-+static int
-+get_bit_depth_for_palette (int num_palette)
-+{
-+  if (num_palette <= 2)
-+    return 1;
-+  else if (num_palette <= 4)
-+    return 2;
-+  else if (num_palette <= 16)
-+    return 4;
-+  else
-+    return 8;
-+}
- 
- /* Spins the color map (palette) putting the transparent color at
-  * index 0 if there is space. If there isn't any space, warn the user
-@@ -422,11 +449,12 @@ ia_has_transparent_pixels (guchar *pixels,
-  */
- 
- static gboolean
--respin_cmap (png_structp  png_ptr,
--             png_infop    png_info_ptr,
-+respin_cmap (png_structp  pp,
-+             png_infop    info,
-              guchar       *remap,
-              gint32       image_id,
--             GimpDrawable *drawable)
-+             GimpDrawable *drawable,
-+             int          *bit_depth)
- {
-   static guchar  trans[] = { 0 };
-   guchar        *before;
-@@ -464,10 +492,13 @@ respin_cmap (png_structp  png_ptr,
- 
-       if (transparent != -1)
-         {
--          png_color palette[256] = { {0, 0, 0} };
-+          static png_color palette[256] = { {0, 0, 0} };
-           gint i;
- 
--          png_set_tRNS (png_ptr, png_info_ptr, (png_bytep) trans, 1, NULL);
-+          /* Set tRNS chunk values for writing later. */
-+          mngg.has_trns = TRUE;
-+          mngg.trans = trans;
-+          mngg.num_trans = 1;
- 
-           /* Transform all pixels with a value = transparent to
-            * 0 and vice versa to compensate for re-ordering in palette
-@@ -489,7 +520,12 @@ respin_cmap (png_structp  png_ptr,
-               palette[i].blue = before[3 * remap[i] + 2];
-             }
- 
--          png_set_PLTE (png_ptr, png_info_ptr, (png_colorp) palette, colors);
-+          /* Set PLTE chunk values for writing later. */
-+          mngg.has_plte = TRUE;
-+          mngg.palette = palette;
-+          mngg.num_palette = colors;
-+
-+          *bit_depth = get_bit_depth_for_palette (colors);
- 
-           return TRUE;
-         }
-@@ -500,7 +536,10 @@ respin_cmap (png_structp  png_ptr,
-         }
-     }
- 
--  png_set_PLTE (png_ptr, png_info_ptr, (png_colorp) before, colors);
-+  mngg.has_plte = TRUE;
-+  mngg.palette = (png_colorp) before;
-+  mngg.num_palette = colors;
-+  *bit_depth = get_bit_depth_for_palette (colors);
- 
-   return FALSE;
- }
-@@ -777,7 +816,6 @@ mng_save_image (const gchar  *filename,
- 
-   for (i = (num_layers - 1); i >= 0; i--)
-     {
--      gint            num_colors;
-       GimpImageType   layer_drawable_type;
-       GimpDrawable   *layer_drawable;
-       gint            layer_offset_x, layer_offset_y;
-@@ -795,8 +833,8 @@ mng_save_image (const gchar  *filename,
-       gchar           frame_mode;
-       int             frame_delay;
-       gchar          *temp_file_name;
--      png_structp     png_ptr;
--      png_infop       png_info_ptr;
-+      png_structp     pp;
-+      png_infop       info;
-       FILE           *infile, *outfile;
-       int             num_passes;
-       int             tile_height;
-@@ -804,6 +842,8 @@ mng_save_image (const gchar  *filename,
-       int             pass, j, k, begin, end, num;
-       guchar         *fixed;
-       guchar          layer_remap[256];
-+      int             color_type;
-+      int             bit_depth;
- 
-       layer_name          = gimp_drawable_get_name (layers[i]);
-       layer_chunks_type   = parse_chunks_type_from_layer_name (layer_name);
-@@ -948,9 +988,9 @@ mng_save_image (const gchar  *filename,
-           goto err3;
-         }
- 
--      png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING,
-+      pp = png_create_write_struct (PNG_LIBPNG_VER_STRING,
-                                          NULL, NULL, NULL);
--      if (NULL == png_ptr)
-+      if (NULL == pp)
-         {
-           g_warning ("Unable to png_create_write_struct() in mng_save_image()");
-           fclose (outfile);
-@@ -958,89 +998,97 @@ mng_save_image (const gchar  *filename,
-           goto err3;
-         }
- 
--      png_info_ptr = png_create_info_struct (png_ptr);
--      if (NULL == png_info_ptr)
-+      info = png_create_info_struct (pp);
-+      if (NULL == info)
-         {
-           g_warning
-             ("Unable to png_create_info_struct() in mng_save_image()");
--          png_destroy_write_struct (&png_ptr, NULL);
-+          png_destroy_write_struct (&pp, NULL);
-           fclose (outfile);
-           g_unlink (temp_file_name);
-           goto err3;
-         }
- 
--      if (setjmp (png_ptr->jmpbuf) != 0)
-+      if (setjmp (png_jmpbuf (pp)) != 0)
-         {
-           g_warning ("HRM saving PNG in mng_save_image()");
--          png_destroy_write_struct (&png_ptr, &png_info_ptr);
-+          png_destroy_write_struct (&pp, &info);
-           fclose (outfile);
-           g_unlink (temp_file_name);
-           goto err3;
-         }
- 
--      png_init_io (png_ptr, outfile);
--      png_set_compression_level (png_ptr, mng_data.compression_level);
-+      png_init_io (pp, outfile);
- 
--      png_info_ptr->width = layer_cols;
--      png_info_ptr->height = layer_rows;
--      png_info_ptr->interlace_type = (mng_data.interlaced == 0 ? 0 : 1);
--      png_info_ptr->bit_depth = 8;
-+      bit_depth = 8;
- 
-       switch (layer_drawable_type)
-         {
-         case GIMP_RGB_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+          color_type = PNG_COLOR_TYPE_RGB;
-           break;
-         case GIMP_RGBA_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+          color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-           break;
-         case GIMP_GRAY_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+          color_type = PNG_COLOR_TYPE_GRAY;
-           break;
-         case GIMP_GRAYA_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+          color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-           break;
-         case GIMP_INDEXED_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--          png_info_ptr->valid |= PNG_INFO_PLTE;
--          png_info_ptr->palette =
--            (png_colorp) gimp_image_get_colormap (image_id, &num_colors);
--          png_info_ptr->num_palette = num_colors;
-+          color_type = PNG_COLOR_TYPE_PALETTE;
-+          mngg.has_plte = TRUE;
-+          mngg.palette = (png_colorp)
-+            gimp_image_get_colormap (image_id, &mngg.num_palette);
-+          bit_depth = get_bit_depth_for_palette (mngg.num_palette);
-           break;
-         case GIMP_INDEXEDA_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+          color_type = PNG_COLOR_TYPE_PALETTE;
-           layer_has_unique_palette =
--            respin_cmap (png_ptr, png_info_ptr, layer_remap,
--                         image_id, layer_drawable);
-+            respin_cmap (pp, info, layer_remap,
-+                         image_id, layer_drawable,
-+                         &bit_depth);
-           break;
-         default:
-           g_warning ("This can't be!\n");
--          png_destroy_write_struct (&png_ptr, &png_info_ptr);
-+          png_destroy_write_struct (&pp, &info);
-           fclose (outfile);
-           g_unlink (temp_file_name);
-           goto err3;
-         }
- 
--      if ((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE)
-+      /* Note: png_set_IHDR() must be called before any other
-+         png_set_*() functions. */
-+      png_set_IHDR (pp, info, layer_cols, layer_rows,
-+                bit_depth,
-+                color_type,
-+                mng_data.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
-+                PNG_COMPRESSION_TYPE_BASE,
-+                PNG_FILTER_TYPE_BASE);
-+
-+      if (mngg.has_trns)
-+        {
-+          png_set_tRNS (pp, info, mngg.trans, mngg.num_trans, NULL);
-+        }
-+
-+      if (mngg.has_plte)
-         {
--          if (png_info_ptr->num_palette <= 2)
--            png_info_ptr->bit_depth = 1;
--          else if (png_info_ptr->num_palette <= 4)
--            png_info_ptr->bit_depth = 2;
--          else if (png_info_ptr->num_palette <= 16)
--            png_info_ptr->bit_depth = 4;
-+          png_set_PLTE (pp, info, mngg.palette, mngg.num_palette);
-         }
- 
--      png_write_info (png_ptr, png_info_ptr);
-+      png_set_compression_level (pp, mng_data.compression_level);
-+
-+      png_write_info (pp, info);
- 
-       if (mng_data.interlaced != 0)
--        num_passes = png_set_interlace_handling (png_ptr);
-+        num_passes = png_set_interlace_handling (pp);
-       else
-         num_passes = 1;
- 
--      if ((png_info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) &&
--          (png_info_ptr->bit_depth < 8))
--        png_set_packing (png_ptr);
-+      if ((color_type == PNG_COLOR_TYPE_PALETTE) &&
-+          (bit_depth < 8))
-+        png_set_packing (pp);
- 
-       tile_height = gimp_tile_height ();
-       layer_pixel = g_new (guchar, tile_height * layer_cols * layer_bpp);
-@@ -1065,7 +1113,7 @@ mng_save_image (const gchar  *filename,
-               gimp_pixel_rgn_get_rect (&layer_pixel_rgn, layer_pixel, 0,
-                                        begin, layer_cols, num);
- 
--              if ((png_info_ptr->valid & PNG_INFO_tRNS) == PNG_INFO_tRNS)
-+              if (png_get_valid (pp, info, PNG_INFO_tRNS))
-                 {
-                   for (j = 0; j < num; j++)
-                     {
-@@ -1077,7 +1125,7 @@ mng_save_image (const gchar  *filename,
-                     }
-                 }
-               else
--                if (((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE)
-+                if (png_get_valid (pp, info, PNG_INFO_PLTE)
-                     && (layer_bpp == 2))
-                 {
-                   for (j = 0; j < num; j++)
-@@ -1089,12 +1137,12 @@ mng_save_image (const gchar  *filename,
-                     }
-                 }
- 
--              png_write_rows (png_ptr, layer_pixels, num);
-+              png_write_rows (pp, layer_pixels, num);
-             }
-         }
- 
--      png_write_end (png_ptr, png_info_ptr);
--      png_destroy_write_struct (&png_ptr, &png_info_ptr);
-+      png_write_end (pp, info);
-+      png_destroy_write_struct (&pp, &info);
- 
-       g_free (layer_pixels);
-       g_free (layer_pixel);
-diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
-index d42afff..8fa8983 100644
---- a/plug-ins/common/file-png.c
-+++ b/plug-ins/common/file-png.c
-@@ -106,6 +106,17 @@ typedef struct
- }
- PngSaveGui;
- 
-+/* These are not saved or restored. */
-+typedef struct
-+{
-+  gboolean   has_trns;
-+  png_bytep  trans;
-+  int        num_trans;
-+  gboolean   has_plte;
-+  png_colorp palette;
-+  int        num_palette;
-+}
-+PngGlobals;
- 
- /*
-  * Local functions...
-@@ -127,7 +138,7 @@ static gboolean  save_image                (const gchar      *filename,
-                                             gint32            orig_image_ID,
-                                             GError          **error);
- 
--static void      respin_cmap               (png_structp       pp,
-+static int       respin_cmap               (png_structp       pp,
-                                             png_infop         info,
-                                             guchar           *remap,
-                                             gint32            image_ID,
-@@ -175,6 +186,7 @@ static const PngSaveVals defaults =
- };
- 
- static PngSaveVals pngvals;
-+static PngGlobals pngg;
- 
- 
- /*
-@@ -653,13 +665,25 @@ on_read_error (png_structp png_ptr, png_const_charp error_msg)
-                                 error_data->drawable->width, num);
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
-+}
-+
-+static int
-+get_bit_depth_for_palette (int num_palette)
-+{
-+  if (num_palette <= 2)
-+    return 1;
-+  else if (num_palette <= 4)
-+    return 2;
-+  else if (num_palette <= 16)
-+    return 4;
-+  else
-+    return 8;
- }
- 
- /*
-  * 'load_image()' - Load a PNG image into a new image window.
-  */
--
- static gint32
- load_image (const gchar  *filename,
-             gboolean      interactive,
-@@ -695,9 +719,20 @@ load_image (const gchar  *filename,
-   gint       num_texts;
- 
-   pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+  if (!pp)
-+    {
-+      /* this could happen if the compile time and run-time libpng
-+         versions do not match. */
-+
-+      g_set_error (error, 0, 0,
-+                   _("Error creating PNG read struct while saving '%s'."),
-+                   gimp_filename_to_utf8 (filename));
-+      return -1;
-+    }
-+
-   info = png_create_info_struct (pp);
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf (pp)))
-     {
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Error while reading '%s'. File corrupted?"),
-@@ -705,10 +740,6 @@ load_image (const gchar  *filename,
-       return image;
-     }
- 
--  /* initialise image here, thus avoiding compiler warnings */
--
--  image = -1;
--
-   /*
-    * Open the file and initialize the PNG read "engine"...
-    */
-@@ -738,17 +769,19 @@ load_image (const gchar  *filename,
-    * Latest attempt, this should be my best yet :)
-    */
- 
--  if (info->bit_depth == 16)
-+  if (png_get_bit_depth (pp, info) == 16)
-     {
-       png_set_strip_16 (pp);
-     }
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8)
-+  if (png_get_color_type (pp, info) == PNG_COLOR_TYPE_GRAY &&
-+      png_get_bit_depth (pp, info) < 8)
-     {
-       png_set_expand (pp);
-     }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (png_get_color_type (pp, info) == PNG_COLOR_TYPE_PALETTE &&
-+      png_get_bit_depth (pp, info) < 8)
-     {
-       png_set_packing (pp);
-     }
-@@ -757,8 +790,8 @@ load_image (const gchar  *filename,
-    * Expand G+tRNS to GA, RGB+tRNS to RGBA
-    */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--      (info->valid & PNG_INFO_tRNS))
-+  if (png_get_color_type (pp, info) != PNG_COLOR_TYPE_PALETTE &&
-+      png_get_valid (pp, info, PNG_INFO_tRNS))
-     {
-       png_set_expand (pp);
-     }
-@@ -775,7 +808,7 @@ load_image (const gchar  *filename,
-    */
- 
-   if (png_get_valid (pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      png_get_color_type (pp, info) == PNG_COLOR_TYPE_PALETTE)
-     {
-       png_get_tRNS (pp, info, &alpha_ptr, &num, NULL);
-       /* Copy the existing alpha values from the tRNS chunk */
-@@ -797,7 +830,7 @@ load_image (const gchar  *filename,
- 
-   png_read_update_info (pp, info);
- 
--  switch (info->color_type)
-+  switch (png_get_color_type (pp, info))
-     {
-     case PNG_COLOR_TYPE_RGB:           /* RGB */
-       bpp = 3;
-@@ -836,7 +869,9 @@ load_image (const gchar  *filename,
-       return -1;
-     }
- 
--  image = gimp_image_new (info->width, info->height, image_type);
-+  image = gimp_image_new (png_get_image_width (pp, info),
-+                          png_get_image_height (pp, info),
-+                          image_type);
-   if (image == -1)
-     {
-       g_set_error (error, 0, 0,
-@@ -849,7 +884,9 @@ load_image (const gchar  *filename,
-    * Create the "background" layer to hold the image...
-    */
- 
--  layer = gimp_layer_new (image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new (image, _("Background"),
-+                          png_get_image_width (pp, info),
-+                          png_get_image_height (pp, info),
-                           layer_type, 100, GIMP_NORMAL_MODE);
-   gimp_image_add_layer (image, layer, 0);
- 
-@@ -883,7 +920,8 @@ load_image (const gchar  *filename,
- 
-       gimp_layer_set_offsets (layer, offset_x, offset_y);
- 
--      if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height))
-+      if ((abs (offset_x) > png_get_image_width (pp, info)) ||
-+          (abs (offset_y) > png_get_image_height (pp, info)))
-         {
-           if (interactive)
-             g_message (_("The PNG file specifies an offset that caused "
-@@ -938,23 +976,27 @@ load_image (const gchar  *filename,
- 
-   empty = 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE)
-+  if (png_get_color_type (pp, info) & PNG_COLOR_MASK_PALETTE)
-     {
-+      png_colorp palette;
-+      int num_palette;
-+
-+      png_get_PLTE (pp, info, &palette, &num_palette);
-       if (png_get_valid (pp, info, PNG_INFO_tRNS))
-         {
-           for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty)
-             /* Calculates number of fully transparent "empty" entries */;
- 
-           /*  keep at least one entry  */
--          empty = MIN (empty, info->num_palette - 1);
-+          empty = MIN (empty, num_palette - 1);
- 
--          gimp_image_set_colormap (image, (guchar *) (info->palette + empty),
--                                   info->num_palette - empty);
-+          gimp_image_set_colormap (image, (guchar *) (palette + empty),
-+                                   num_palette - empty);
-         }
-       else
-         {
--          gimp_image_set_colormap (image, (guchar *) info->palette,
--                                   info->num_palette);
-+          gimp_image_set_colormap (image, (guchar *) palette,
-+                                   num_palette);
-         }
-     }
- 
-@@ -972,18 +1014,19 @@ load_image (const gchar  *filename,
-    */
- 
-   tile_height = gimp_tile_height ();
--  pixel = g_new0 (guchar, tile_height * info->width * bpp);
-+  pixel = g_new0 (guchar, tile_height * png_get_image_width (pp, info) * bpp);
-   pixels = g_new (guchar *, tile_height);
- 
-   for (i = 0; i < tile_height; i++)
--    pixels[i] = pixel + info->width * info->channels * i;
-+    pixels[i] = pixel + png_get_image_width (pp, info) *
-+      png_get_channels (pp, info) * i;
- 
-   /* Install our own error handler to handle incomplete PNG files better */
-   error_data.drawable    = drawable;
-   error_data.pixel       = pixel;
-   error_data.tile_height = tile_height;
--  error_data.width       = info->width;
--  error_data.height      = info->height;
-+  error_data.width       = png_get_image_width (pp, info);
-+  error_data.height      = png_get_image_height (pp, info);
-   error_data.bpp         = bpp;
-   error_data.pixel_rgn   = &pixel_rgn;
- 
-@@ -996,10 +1039,11 @@ load_image (const gchar  *filename,
-        */
- 
-       for (begin = 0, end = tile_height;
--           begin < info->height; begin += tile_height, end += tile_height)
-+           begin < png_get_image_height (pp, info);
-+           begin += tile_height, end += tile_height)
-         {
--          if (end > info->height)
--            end = info->height;
-+          if (end > png_get_image_height (pp, info))
-+            end = png_get_image_height (pp, info);
- 
-           num = end - begin;
- 
-@@ -1016,11 +1060,13 @@ load_image (const gchar  *filename,
-           gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin,
-                                    drawable->width, num);
- 
--          memset (pixel, 0, tile_height * info->width * bpp);
-+          memset (pixel, 0,
-+                  tile_height * png_get_image_width (pp, info) * bpp);
- 
--          gimp_progress_update (((gdouble) pass +
--                                 (gdouble) end / (gdouble) info->height) /
--                                (gdouble) num_passes);
-+          gimp_progress_update
-+            (((gdouble) pass +
-+              (gdouble) end / (gdouble) png_get_image_height (pp, info)) /
-+             (gdouble) num_passes);
-         }
-     }
- 
-@@ -1189,7 +1235,6 @@ save_image (const gchar  *filename,
-   GimpPixelRgn pixel_rgn;       /* Pixel region for layer */
-   png_structp pp;               /* PNG read pointer */
-   png_infop info;               /* PNG info pointer */
--  gint num_colors;              /* Number of colors in colormap */
-   gint offx, offy;              /* Drawable offsets from origin */
-   guchar **pixels,              /* Pixel rows */
-    *fixed,                      /* Fixed-up pixel data */
-@@ -1200,56 +1245,28 @@ save_image (const gchar  *filename,
-   guchar red, green, blue;      /* Used for palette background */
-   time_t cutime;                /* Time since epoch */
-   struct tm *gmt;               /* GMT broken down */
-+  int color_type;
-+  int bit_depth;
- 
-   guchar remap[256];            /* Re-mapping for the palette */
- 
-   png_textp  text = NULL;
- 
--  if (pngvals.comment)
-+  pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+  if (!pp)
-     {
--      GimpParasite *parasite;
--      gsize text_length = 0;
--
--      parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
--      if (parasite)
--        {
--          gchar *comment = g_strndup (gimp_parasite_data (parasite),
--                                      gimp_parasite_data_size (parasite));
-+      /* this could happen if the compile time and run-time libpng
-+         versions do not match. */
- 
--          gimp_parasite_free (parasite);
--
--          text = g_new0 (png_text, 1);
--          text->key         = "Comment";
--
--#ifdef PNG_iTXt_SUPPORTED
--
--          text->compression = PNG_ITXT_COMPRESSION_NONE;
--          text->text        = comment;
--          text->itxt_length = strlen (comment);
--
--#else
--
--          text->compression = PNG_TEXT_COMPRESSION_NONE;
--          text->text        = g_convert (comment, -1,
--                                         "ISO-8859-1", "UTF-8",
--                                         NULL, &text_length,
--                                         NULL);
--          text->text_length = text_length;
--
--#endif
--
--          if (!text->text)
--            {
--              g_free (text);
--              text = NULL;
--            }
--        }
-+      g_set_error (error, 0, 0,
-+                   _("Error creating PNG write struct while saving '%s'."),
-+                   gimp_filename_to_utf8 (filename));
-+      return FALSE;
-     }
- 
--  pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-   info = png_create_info_struct (pp);
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf (pp)))
-     {
-       g_set_error (error, 0, 0,
-                    _("Error while saving '%s'. Could not save image."),
-@@ -1257,9 +1274,6 @@ save_image (const gchar  *filename,
-       return FALSE;
-     }
- 
--  if (text)
--    png_set_text (pp, info, text, 1);
--
-   /*
-    * Open the file and initialize the PNG write "engine"...
-    */
-@@ -1286,17 +1300,6 @@ save_image (const gchar  *filename,
-   type = gimp_drawable_type (drawable_ID);
- 
-   /*
--   * Set the image dimensions, bit depth, interlacing and compression
--   */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->bit_depth      = 8;
--  info->interlace_type = pngvals.interlaced;
--
--  /*
-    * Initialise remap[]
-    */
-   for (i = 0; i < 256; i++)
-@@ -1306,42 +1309,44 @@ save_image (const gchar  *filename,
-    * Set color type and remember bytes per pixel count
-    */
- 
-+  bit_depth = 8;
-+
-   switch (type)
-     {
-     case GIMP_RGB_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_RGB;
-+      color_type = PNG_COLOR_TYPE_RGB;
-       bpp = 3;
-       break;
- 
-     case GIMP_RGBA_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+      color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-       bpp = 4;
-       break;
- 
-     case GIMP_GRAY_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_GRAY;
-+      color_type = PNG_COLOR_TYPE_GRAY;
-       bpp = 1;
-       break;
- 
-     case GIMP_GRAYA_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+      color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-       bpp = 2;
-       break;
- 
-     case GIMP_INDEXED_IMAGE:
-       bpp = 1;
--      info->color_type = PNG_COLOR_TYPE_PALETTE;
--      info->valid |= PNG_INFO_PLTE;
--      info->palette =
--        (png_colorp) gimp_image_get_colormap (image_ID, &num_colors);
--      info->num_palette = num_colors;
-+      color_type = PNG_COLOR_TYPE_PALETTE;
-+      pngg.has_plte = TRUE;
-+      pngg.palette = (png_colorp) gimp_image_get_colormap (image_ID,
-+                                                           &pngg.num_palette);
-+      bit_depth = get_bit_depth_for_palette (pngg.num_palette);
-       break;
- 
-     case GIMP_INDEXEDA_IMAGE:
-       bpp = 2;
--      info->color_type = PNG_COLOR_TYPE_PALETTE;
-+      color_type = PNG_COLOR_TYPE_PALETTE;
-       /* fix up transparency */
--      respin_cmap (pp, info, remap, image_ID, drawable);
-+      bit_depth = respin_cmap (pp, info, remap, image_ID, drawable);
-       break;
- 
-     default:
-@@ -1349,21 +1354,29 @@ save_image (const gchar  *filename,
-       return FALSE;
-     }
- 
--  /*
--   * Fix bit depths for (possibly) smaller colormap images
--   */
-+  /* Note: png_set_IHDR() must be called before any other png_set_*()
-+     functions. */
-+  png_set_IHDR (pp, info, drawable->width, drawable->height,
-+                bit_depth,
-+                color_type,
-+                pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
-+                PNG_COMPRESSION_TYPE_BASE,
-+                PNG_FILTER_TYPE_BASE);
-+
-+  if (pngg.has_trns)
-+    {
-+      png_set_tRNS (pp, info, pngg.trans, pngg.num_trans, NULL);
-+    }
- 
--  if (info->valid & PNG_INFO_PLTE)
-+  if (pngg.has_plte)
-     {
--      if (info->num_palette <= 2)
--        info->bit_depth = 1;
--      else if (info->num_palette <= 4)
--        info->bit_depth = 2;
--      else if (info->num_palette <= 16)
--        info->bit_depth = 4;
--      /* otherwise the default is fine */
-+      png_set_PLTE (pp, info, pngg.palette, pngg.num_palette);
-     }
- 
-+  /* Set the compression level */
-+
-+  png_set_compression_level (pp, pngvals.compression_level);
-+
-   /* All this stuff is optional extras, if the user is aiming for smallest
-      possible file size she can turn them all off */
- 
-@@ -1462,6 +1475,52 @@ save_image (const gchar  *filename,
-   }
- #endif
- 
-+  if (pngvals.comment)
-+    {
-+      GimpParasite *parasite;
-+#ifndef PNG_iTXt_SUPPORTED
-+      gsize text_length = 0;
-+#endif /* PNG_iTXt_SUPPORTED */
-+
-+      parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
-+      if (parasite)
-+        {
-+          gchar *comment = g_strndup (gimp_parasite_data (parasite),
-+                                      gimp_parasite_data_size (parasite));
-+
-+          gimp_parasite_free (parasite);
-+
-+          text = g_new0 (png_text, 1);
-+          text->key         = "Comment";
-+
-+#ifdef PNG_iTXt_SUPPORTED
-+
-+          text->compression = PNG_ITXT_COMPRESSION_NONE;
-+          text->text        = comment;
-+          text->itxt_length = strlen (comment);
-+
-+#else
-+
-+          text->compression = PNG_TEXT_COMPRESSION_NONE;
-+          text->text        = g_convert (comment, -1,
-+                                         "ISO-8859-1", "UTF-8",
-+                                         NULL, &text_length,
-+                                         NULL);
-+          text->text_length = text_length;
-+
-+#endif
-+
-+          if (!text->text)
-+            {
-+              g_free (text);
-+              text = NULL;
-+            }
-+        }
-+    }
-+
-+  if (text)
-+    png_set_text (pp, info, text, 1);
-+
-   png_write_info (pp, info);
- 
-   /*
-@@ -1477,7 +1536,8 @@ save_image (const gchar  *filename,
-    * Convert unpacked pixels to packed if necessary
-    */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE &&
-+      bit_depth < 8)
-     png_set_packing (pp);
- 
-   /*
-@@ -1507,7 +1567,9 @@ save_image (const gchar  *filename,
- 
-           gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin,
-                                    drawable->width, num);
--          /*if we are with a RGBA image and have to pre-multiply the alpha channel */
-+
-+          /* If we are with a RGBA image and have to pre-multiply the
-+             alpha channel */
-           if (bpp == 4 && ! pngvals.save_transp_pixels)
-             {
-               for (i = 0; i < num; ++i)
-@@ -1529,7 +1591,7 @@ save_image (const gchar  *filename,
- 
-           /* If we're dealing with a paletted image with
-            * transparency set, write out the remapped palette */
--          if (info->valid & PNG_INFO_tRNS)
-+          if (png_get_valid (pp, info, PNG_INFO_tRNS))
-             {
-               guchar inverse_remap[256];
- 
-@@ -1547,9 +1609,11 @@ save_image (const gchar  *filename,
-                     }
-                 }
-             }
-+
-           /* Otherwise if we have a paletted image and transparency
-            * couldn't be set, we ignore the alpha channel */
--          else if (info->valid & PNG_INFO_PLTE && bpp == 2)
-+          else if (png_get_valid (pp, info, PNG_INFO_PLTE) &&
-+                   bpp == 2)
-             {
-               for (i = 0; i < num; ++i)
-                 {
-@@ -1564,7 +1628,7 @@ save_image (const gchar  *filename,
-           png_write_rows (pp, pixels, num);
- 
-           gimp_progress_update (((double) pass + (double) end /
--                                 (double) info->height) /
-+                                 (double) drawable->height) /
-                                 (double) num_passes);
-         }
-     }
-@@ -1694,14 +1758,14 @@ find_unused_ia_color (GimpDrawable *drawable,
- }
- 
- 
--static void
-+static int
- respin_cmap (png_structp   pp,
-              png_infop     info,
-              guchar       *remap,
-              gint32        image_ID,
-              GimpDrawable *drawable)
- {
--  static const guchar trans[] = { 0 };
-+  static guchar trans[] = { 0 };
- 
-   gint          colors;
-   guchar       *before;
-@@ -1728,10 +1792,13 @@ respin_cmap (png_structp   pp,
-                                      * index - do like gif2png and swap
-                                      * index 0 and index transparent */
-         {
--          png_color palette[256];
-+          static png_color palette[256];
-           gint      i;
- 
--          png_set_tRNS (pp, info, (png_bytep) trans, 1, NULL);
-+          /* Set tRNS chunk values for writing later. */
-+          pngg.has_trns = TRUE;
-+          pngg.trans = trans;
-+          pngg.num_trans = 1;
- 
-           /* Transform all pixels with a value = transparent to
-            * 0 and vice versa to compensate for re-ordering in palette
-@@ -1752,7 +1819,10 @@ respin_cmap (png_structp   pp,
-               palette[i].blue = before[3 * remap[i] + 2];
-             }
- 
--          png_set_PLTE (pp, info, palette, colors);
-+          /* Set PLTE chunk values for writing later. */
-+          pngg.has_plte = TRUE;
-+          pngg.palette = palette;
-+          pngg.num_palette = colors;
-         }
-       else
-         {
-@@ -1760,14 +1830,22 @@ respin_cmap (png_structp   pp,
-            * transparency & just use the full palette */
-           g_message (_("Couldn't losslessly save transparency, "
-                        "saving opacity instead."));
--          png_set_PLTE (pp, info, (png_colorp) before, colors);
-+
-+          /* Set PLTE chunk values for writing later. */
-+          pngg.has_plte = TRUE;
-+          pngg.palette = (png_colorp) before;
-+          pngg.num_palette = colors;
-         }
-     }
-   else
-     {
--      png_set_PLTE (pp, info, (png_colorp) before, colors);
-+      /* Set PLTE chunk values for writing later. */
-+      pngg.has_plte = TRUE;
-+      pngg.palette = (png_colorp) before;
-+      pngg.num_palette = colors;
-     }
- 
-+  return get_bit_depth_for_palette (colors);
- }
- 
- static gboolean
diff --git a/staging/gimp/linux.gpl b/staging/gimp/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/staging/gimp/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/staging/gimp/uri-backend-libcurl.patch b/staging/gimp/uri-backend-libcurl.patch
deleted file mode 100644
index 85da2fc7f..000000000
--- a/staging/gimp/uri-backend-libcurl.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c
---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c	2010-07-03 00:51:59.000000000 +0200
-+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c	2011-06-23 19:15:30.000000000 +0200
-@@ -4,9 +4,9 @@
-  * libcurl backend for the URI plug-in
-  * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org>
-  *
-- * This program is free software; you can redistribute it and/or modify
-+ * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-+ * the Free Software Foundation; either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-@@ -15,8 +15,7 @@
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
- #include "config.h"
-@@ -24,7 +23,6 @@
- #include <errno.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <glib/gstdio.h>
-@@ -63,7 +61,7 @@
- 
-   vinfo = curl_version_info (CURLVERSION_NOW);
- 
--  protocols = g_string_new ("http:,ftp:");
-+  protocols = g_string_new ("http:,ftp:,gopher:");
- 
-   if (vinfo->features & CURL_VERSION_SSL)
-     {
-@@ -153,7 +151,7 @@
-   FILE      *out_file;
-   CURL      *curl_handle;
-   CURLcode   result;
--  gint       response_code;
-+  glong      response_code;
- 
-   gimp_progress_init (_("Connecting to server"));
- 
-@@ -195,12 +193,12 @@
- 
-   curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
- 
--  if (response_code != 200)
-+  if (response_code != 200 && response_code != 226 && response_code != 0)
-     {
-       fclose (out_file);
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Opening '%s' for reading resulted in HTTP "
--                     "response code: %d"),
-+                     "response code: %ld"),
-                    uri, response_code);
-       curl_easy_cleanup (curl_handle);
-       return FALSE;
-@@ -224,3 +222,10 @@
- 
-   return FALSE;
- }
-+
-+gchar *
-+uri_backend_map_image (const gchar  *uri,
-+                       GimpRunMode   run_mode)
-+{
-+  return NULL;
-+}
diff --git a/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD
deleted file mode 100644
index 47a027b19..000000000
--- a/staging/glade-perl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147196 2012-01-24 05:13:43Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glade-perl
-_realname=Gtk2-GladeXML
-pkgver=1.007
-pkgrel=5
-pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('libglade' 'gtk2-perl' 'perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('e6ca234e2a9f0221263acd2a593c583b')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/glhack/PKGBUILD b/staging/glhack/PKGBUILD
deleted file mode 100644
index 6ac706ee1..000000000
--- a/staging/glhack/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 146929 2012-01-19 10:08:04Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=glhack
-pkgver=1.2
-pkgrel=6
-pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
-arch=('i686' 'x86_64')
-url="http://glhack.sourceforge.net/"
-license=('custom')
-depends=('sdl' 'libpng' 'libgl')
-makedepends=('mesa')
-options=('!makeflags')
-install=glhack.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch)
-sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
-          '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
-
-build(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../glhack-libpng15.patch
-  sed -i 's|/usr/lib/games|/usr/share|' include/config.h
-  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
-  sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile
-  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = $(DESTDIR)/var/games/glhack|' Makefile
-  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile
-  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = $(PREFIX)/share/$(GAME)|' Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}"/usr/share/man/man{5,6}
-  make DESTDIR="$pkgdir" install
-  install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license"
-
-# Renaming man pages which conflicts with nethack
-  cd "${pkgdir}/usr/share/man/man6"
-  for manpage in dgn_comp dlb lev_comp nethack recover; do
-    mv $manpage.6 $manpage-glhack.6
-  done
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack"
-  mv "${pkgdir}/usr/share/glhack/recover_glhack" "${pkgdir}/usr/bin/recover_glhack"
-
-  chown -R root:root "${pkgdir}/usr/share/glhack"
-
-  rm -r "${pkgdir}"/var/games/glhack
-  install -d "${pkgdir}/var/games/glhack/save"
-  chmod -R 775 "${pkgdir}/var/games"
-  chown -R root:games "${pkgdir}/var/games"
-}
diff --git a/staging/glhack/glhack-libpng15.patch b/staging/glhack/glhack-libpng15.patch
deleted file mode 100644
index d8e644d1c..000000000
--- a/staging/glhack/glhack-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- win/gl/gl_image.c.old	2012-01-19 04:01:26.000000000 -0500
-+++ win/gl/gl_image.c	2012-01-19 04:03:04.000000000 -0500
-@@ -486,7 +486,7 @@
-   /* set error handling since we are using the setjmp/longjmp method
-    * (this is the normal method of doing things with libpng).
-    */
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-   {
-     sdlgl_warning("Problem within LibPNG (unknown)\n");
-     goto failed;
diff --git a/staging/glhack/glhack.install b/staging/glhack/glhack.install
deleted file mode 100644
index 78e1655bc..000000000
--- a/staging/glhack/glhack.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  touch var/games/glhack/{record,perm,logfile}
-  chown root:games var/games/glhack/{record,perm,logfile}
-  chmod 664 var/games/glhack/{record,perm,logfile}
-}
-
-pre_upgrade() {
-  install -d -m775 var/games/glhack
-  chown root:games var/games/glhack
-  [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack
-  [ -e usr/share/glhack/perm ] && cp usr/share/glhack/perm var/games/glhack
-  [ -e usr/share/glhack/logfile ] && cp usr/share/glhack/logfile var/games/glhack
-  if [ -d usr/share/glhack/save ]; then
-    chmod g-s usr/share/glhack/save
-    mv usr/share/glhack/save var/games/glhack
-  else
-    install -d -m775 var/games/glhack/save
-  fi
-  chown root:games var/games/glhack/save
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/staging/gmime/PKGBUILD b/staging/gmime/PKGBUILD
deleted file mode 100644
index 013a38c82..000000000
--- a/staging/gmime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146576 2012-01-13 20:06:15Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gmime
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="Core mime parsing library"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://spruce.sourceforge.net/gmime/"
-depends=('glib2' 'gpgme' 'zlib')
-makedepends=('gtk-sharp-2')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163')
-
-build() {
-  # get rid of that .wapi errors in fakeroot
-  export MONO_SHARED_DIR="$srcdir/weird"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/gnome-color-manager/PKGBUILD b/staging/gnome-color-manager/PKGBUILD
deleted file mode 100644
index 3fcef2e0e..000000000
--- a/staging/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 147672 2012-01-26 09:42:51Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.2.2
-pkgrel=2
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash' 'shared-color-profiles' 'shared-color-targets')
-makedepends=('intltool' 'gtk-doc')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager \
-      --disable-static --disable-man-pages
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/gnome-color-manager/gnome-color-manager.install b/staging/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/staging/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/staging/gnome-desktop2/PKGBUILD b/staging/gnome-desktop2/PKGBUILD
deleted file mode 100644
index 130dbeaff..000000000
--- a/staging/gnome-desktop2/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 147230 2012-01-24 20:46:21Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor:  Jan de Groot <jan@archlinux.org>
-
-_pkgname=gnome-desktop
-pkgname=${_pkgname}2
-pkgver=2.32.1
-pkgrel=2
-pkgdesc="Library with common API for various GNOME modules (legacy version)"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(gconf gtk2 startup-notification)
-makedepends=(gnome-doc-utils intltool)
-url="http://www.gnome.org"
-options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
-sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Archlinux" \
-      --disable-scrollkeeper \
-      --disable-gnome-about --disable-desktop-docs
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/gnome-perl/PKGBUILD b/staging/gnome-perl/PKGBUILD
deleted file mode 100644
index a5c2d68ad..000000000
--- a/staging/gnome-perl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147560 2012-01-25 23:03:24Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-perl
-_realname=Gnome2
-pkgver=1.042
-pkgrel=7
-pkgdesc="Perl bindings for libgnome"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('eb7b624114e45e54e022a633ffc1cce6')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gnome-python/PKGBUILD b/staging/gnome-python/PKGBUILD
deleted file mode 100644
index 7e6fce33b..000000000
--- a/staging/gnome-python/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 147212 2012-01-24 19:17:06Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgbase=gnome-python
-pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
-pkgver=2.28.1
-pkgrel=8
-arch=(i686 x86_64)
-license=('LGPL')
-makedepends=('pygtk' 'pyorbit' 'libgnomeui')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2)
-sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8')
-
-build() {
-    cd "${srcdir}/gnome-python-${pkgver}"
-    PYTHON=python2 ./configure --prefix=/usr
-    make
-}
-
-package_gnome-python() {
-    pkgdesc="PyGNOME Python extension module"
-    depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-bonobo(){
-    pkgdesc="Python bindings for interacting with Bonobo"
-    depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C bonobo install DESTDIR="${pkgdir}"
-}
-
-package_python2-gconf(){
-    pkgdesc="Python bindings for interacting with GConf"
-    depends=('pygtk' 'gconf')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gconf install DESTDIR="${pkgdir}"
-}
-
-package_python2-libgnome() {
-    pkgdesc="Python bindings for libgnome"
-    depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas' 'python2-bonobo')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gnome install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomecanvas() {
-    pkgdesc="Python bindings for the GNOME Canvas"
-    depends=('pygtk' 'libgnomecanvas')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gnomecanvas install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomevfs() {
-    pkgdesc="Python bindings for interacting with gnome-vfs"
-    depends=('python2' 'libbonobo' 'gnome-vfs')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gnomevfs install DESTDIR="${pkgdir}"
-}
diff --git a/staging/gnome-sharp/PKGBUILD b/staging/gnome-sharp/PKGBUILD
deleted file mode 100644
index a02143afc..000000000
--- a/staging/gnome-sharp/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 147553 2012-01-25 22:28:03Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgbase=gnome-sharp
-pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
-pkgver=2.24.2
-pkgrel=2
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://gtk-sharp.sourceforge.net"
-makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3b38f53960c736d4afb8f04204efe98b')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package_gnome-sharp() {
-  pkgdesc="GNOME bindings for C#"
-  depends=('art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
-}
-
-package_art-sharp() {
-  pkgdesc="Mono bindings for libart"
-  depends=('gtk-sharp-2' 'libart-lgpl')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C art install DESTDIR="${pkgdir}"
-}
-
-package_gconf-sharp() {
-  pkgdesc="Mono bindings for GConf"
-  depends=('gtk-sharp-2' 'gconf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gconf/GConf install DESTDIR="${pkgdir}"
-  make -C gconf/tools install DESTDIR="${pkgdir}"
-}
-
-package_gconf-sharp-peditors() {
-  pkgdesc="Mono bindings for GConf - Property Editing classes"
-  depends=('gconf-sharp' 'libgnome-sharp')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gconf/GConf.PropertyEditors install DESTDIR="${pkgdir}"
-}
-
-package_libgnome-sharp() {
-  pkgdesc="Mono bindings for libgnome"
-  depends=('art-sharp' 'gnome-vfs-sharp' 'libgnomeui')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnome install DESTDIR="${pkgdir}"
-}
-
-package_gnome-vfs-sharp() {
-  pkgdesc="Mono bindings for GNOME-VFS"
-  depends=('gtk-sharp-2' 'gnome-vfs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomevfs install DESTDIR="${pkgdir}"
-}
diff --git a/staging/gnomecanvas-perl/PKGBUILD b/staging/gnomecanvas-perl/PKGBUILD
deleted file mode 100644
index 2bdc00f77..000000000
--- a/staging/gnomecanvas-perl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147550 2012-01-25 21:35:36Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnomecanvas-perl
-_realname=Gnome2-Canvas
-pkgver=1.002
-pkgrel=9
-pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('gtk2-perl' 'libgnomecanvas' 'perl')
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('93405a987ba4bbd03c2f91592b88f5cb')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/grafx2/PKGBUILD b/staging/grafx2/PKGBUILD
deleted file mode 100644
index 597f6472c..000000000
--- a/staging/grafx2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 62289 2012-01-19 00:16:04Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Simon Parzer <simon.parzer@gmail.com>
-pkgname=grafx2
-pkgver=2.3
-pkgrel=3
-pkgdesc="Pixelart-oriented painting program"
-arch=('x86_64' 'i686')
-url="http://code.google.com/p/grafx2/"
-license=('GPL2')
-install=grafx2.install
-depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils')
-source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz"
-        "grafx2.desktop")
-md5sums=('916a35c4762e85b4210a1041fbbfd830'
-         '9b3ecb5c2d44b987d65257184f46e6c4')
-
-build() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Compiling..."
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Packaging files..."
-  make prefix="/usr" DESTDIR="$pkgdir" install
-  msg2 "Packaging shortcut..."
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  msg2 "Packaging documentation..."
-  install -Dm644 "$srcdir/$pkgname/doc/README.txt" \
-    "$pkgdir/usr/share/doc/$pkgname/readme.txt"
-  msg2 "Packaging license..."
-  install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  msg2 "Cleaning up..."
-  rmdir "$pkgdir/usr/share/grafx2/scripts/libs"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/grafx2/grafx2.desktop b/staging/grafx2/grafx2.desktop
deleted file mode 100644
index d58bc5ed3..000000000
--- a/staging/grafx2/grafx2.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=GrafX2
-Name=GrafX2
-Comment=Pixelart-oriented painting program
-Exec=grafx2 %U
-TryExec=grafx2
-Icon=grafx2
-Terminal=false
-Type=Application
-Categories=Graphics;2DGraphics;RasterGraphics
-MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff
diff --git a/staging/grafx2/grafx2.install b/staging/grafx2/grafx2.install
deleted file mode 100644
index 12589796c..000000000
--- a/staging/grafx2/grafx2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=grafx2
-
-post_upgrade() {
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/graphicsmagick/PKGBUILD b/staging/graphicsmagick/PKGBUILD
deleted file mode 100644
index 7ca0a92e3..000000000
--- a/staging/graphicsmagick/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 146915 2012-01-19 05:34:57Z bisson $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Anton Leontiev <bunder@t-25.ru>
-
-pkgname=graphicsmagick
-pkgver=1.3.13
-pkgrel=2
-pkgdesc='Image processing system'
-url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
-license=('MIT')
-makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
-         'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6')
-
-build() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--with-perl \
-		--enable-shared \
-		--disable-static \
-		--with-gs-font-dir=/usr/share/fonts/Type1 \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	# Install MIT license
-	install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
-
-	# Install perl bindings
-	# The patching was introduced in order to build perl module without installing package itself and
-	# not to introduce unnecessary path into LD_RUN_PATH
-	cd PerlMagick
-	sed -i -e "s:'LDDLFLAGS'  => \"\(.*\)\":'LDDLFLAGS'  => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
-	perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
-	sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
-	make
-	make install
-
-	# Remove perllocal.pod and .packlist
-	rm -rf "${pkgdir}/usr/lib/perl5/core_perl"
-	rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist"
-}
diff --git a/staging/graphviz/LICENSE b/staging/graphviz/LICENSE
deleted file mode 100644
index 16cc69a52..000000000
--- a/staging/graphviz/LICENSE
+++ /dev/null
@@ -1,87 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/staging/graphviz/PKGBUILD b/staging/graphviz/PKGBUILD
deleted file mode 100644
index 41270f5fb..000000000
--- a/staging/graphviz/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 146913 2012-01-19 05:23:33Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=graphviz
-pkgver=2.28.0
-pkgrel=7
-pkgdesc='Graph visualization software'
-url='http://www.graphviz.org/'
-license=('custom:EPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
-            'lua: lua bindings'
-            'ocaml: ocaml bindings'
-            'perl: perl bindings'
-            'php: php bindings'
-            'python2: python bindings'
-            'r: r bindings'
-            'ruby: ruby bindings'
-            'tcl: tcl bindings'
-            'qt: gvedit')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'LICENSE')
-sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
-          'e78277e502c29abb74b9587a5dc951ec392554ea')
-
-options=('!libtool')
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure
-	sed -i '/LIBPOSTFIX="64"/d' configure
-	export PYTHON=python2
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# cf. http://www.graphviz.org/License.php
-	install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE
-}
diff --git a/staging/graphviz/install b/staging/graphviz/install
deleted file mode 100644
index 65fba522b..000000000
--- a/staging/graphviz/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	rm -f usr/lib/graphviz/config{,6}
-	usr/bin/dot -c
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	rm -f usr/lib/graphviz/config{,6}
-}
diff --git a/staging/grilo-plugins/PKGBUILD b/staging/grilo-plugins/PKGBUILD
deleted file mode 100644
index 53fb29f9b..000000000
--- a/staging/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 146585 2012-01-13 21:27:23Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.1.18
-pkgrel=2
-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')
-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)
-sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gstreamer0.10-good/PKGBUILD b/staging/gstreamer0.10-good/PKGBUILD
deleted file mode 100644
index 66e079f98..000000000
--- a/staging/gstreamer0.10-good/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 147113 2012-01-22 10:40:14Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-good
-pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
-pkgver=0.10.30
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
-sha256sums=('b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6')
-
-build() {
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --disable-schemas-install \
-    --disable-hal \
-    --disable-esd \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-
-  make
-  sed -e 's/gst sys ext/gst/' -i Makefile
-}
-
-package_gstreamer0.10-good() {
-  depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
-  pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
-
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/etc/gconf"
-}
-
-package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev')
-  pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
-  conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
-  install=gstreamer0.10-good-plugins.install
-
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make -C sys DESTDIR="${pkgdir}" install
-  make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas"
-}
diff --git a/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install
deleted file mode 100644
index e343beea5..000000000
--- a/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gstreamer0.10-good-plugins
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD
deleted file mode 100644
index fee27cc78..000000000
--- a/staging/gthumb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147076 2012-01-21 15:34:53Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=2.14.1
-pkgrel=2
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://gthumb.sourceforge.net/"
-depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base')
-optdepends=('gstreamer0.10-base: video support')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install
deleted file mode 100644
index 6046ebb6f..000000000
--- a/staging/gthumb/gthumb.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gthumb
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/gtk-engines/PKGBUILD b/staging/gtk-engines/PKGBUILD
deleted file mode 100644
index 0883d0ab4..000000000
--- a/staging/gtk-engines/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 147188 2012-01-24 03:20:02Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtk-engines
-pkgver=2.20.2
-pkgrel=2
-pkgdesc="Theme engines for GTK+ 2"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk2>=2.22.0')
-makedepends=('pkg-config' 'intltool')
-options=('!libtool')
-url="http://live.gnome.org/GnomeArt"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-conflicts=('lighthouse-gtk2' 'clearlooks-gtk2')
-replaces=('lighthouse-gtk2')
-sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-animation
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gtkglext/PKGBUILD b/staging/gtkglext/PKGBUILD
deleted file mode 100644
index 60357e286..000000000
--- a/staging/gtkglext/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 146971 2012-01-19 19:43:46Z giovanni $
-# Maintainer:
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gtkglext
-pkgver=1.2.0
-pkgrel=7
-pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-license=('LGPL')
-depends=('gtk2' 'mesa' 'libxmu')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-	'gtk2.20.patch')
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
-         'e5a87ec3f2d0e616c6f32f90c3f7237f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/gtk2.20.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
-
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gtkglext/gtk2.20.patch b/staging/gtkglext/gtk2.20.patch
deleted file mode 100644
index 54b34c11e..000000000
--- a/staging/gtkglext/gtk2.20.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
-+++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
-@@ -127,7 +127,7 @@
-    * Synchronize OpenGL and window resizing request streams.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
-+  if (gtk_widget_get_realized (widget) && private->is_realized)
-     {
-       gldrawable = gdk_window_get_gl_drawable (widget->window);
-       gdk_gl_drawable_wait_gdk (gldrawable);
-@@ -154,7 +154,7 @@
-    * Remove OpenGL-capability from widget->window.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     gdk_window_unset_gl_capability (widget->window);
- 
-   private->is_realized = FALSE;
-@@ -174,7 +174,7 @@
-    */
- 
-   toplevel = gtk_widget_get_toplevel (widget);
--  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
-+  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - Install colormap to the top-level window."));
-@@ -194,7 +194,7 @@
-    * Set a background of "None" on window to avoid AIX X server crash.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - window->bg_pixmap = %p",
-@@ -250,8 +250,8 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
-+  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
-+  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
-   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
- 
-   /* 
-@@ -432,7 +432,7 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   gldrawable = gdk_window_get_gl_drawable (widget->window);
-   if (gldrawable == NULL)
-@@ -474,7 +474,7 @@
-   GLWidgetPrivate *private;
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
-   if (private == NULL)
-@@ -501,7 +501,7 @@
- gtk_widget_get_gl_window (GtkWidget *widget)
- {
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   return gdk_window_get_gl_window (widget->window);
- }
diff --git a/staging/gtkhtml/PKGBUILD b/staging/gtkhtml/PKGBUILD
deleted file mode 100644
index 45bc4353c..000000000
--- a/staging/gtkhtml/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147192 2012-01-24 04:25:29Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtkhtml
-pkgver=3.32.2
-pkgrel=3
-pkgdesc="A lightweight HTML renderer/editor widget for GTK2"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gtkhtml \
-      --localstatedir=/var --disable-static \
-      --disable-deprecated-warning-flags
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/bin/gtkhtml-editor-test"
-}
diff --git a/staging/gtkmm/PKGBUILD b/staging/gtkmm/PKGBUILD
deleted file mode 100644
index 40eae3010..000000000
--- a/staging/gtkmm/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 147190 2012-01-24 04:22:44Z eric $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtkmm
-pkgname=('gtkmm' 'gtkmm-docs')
-pkgver=2.24.2
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm() {
-  pkgdesc="C++ bindings for gtk2"
-  depends=('gtk2' 'pangomm' 'atkmm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gtkmm-docs() {
-  pkgdesc="Developer documentation for gtkmm v2"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C docs DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gtksourceview2/PKGBUILD b/staging/gtksourceview2/PKGBUILD
deleted file mode 100644
index 6f0777cb6..000000000
--- a/staging/gtksourceview2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 147186 2012-01-24 03:16:31Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtksourceview2
-pkgver=2.10.5
-pkgrel=2
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2>=2.22.0' 'libxml2>=2.7.7')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
-sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e')
-
-build() {
-  cd "${srcdir}/gtksourceview-${pkgver}"
-  sed -i 's#python#python2#' gtksourceview/language-specs/convert.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/gtksourceview-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD
deleted file mode 100644
index f481c13d3..000000000
--- a/staging/hugin/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146975 2012-01-19 20:40:48Z eric $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=hugin
-pkgver=2011.4.0
-pkgrel=1
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('GPL')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
-         'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap')
-install=hugin.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build && cd build
-  cmake "${srcdir}/${pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
-    -DENABLE_LAPACK=yes
-  make
-}
-
-package(){
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/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/hylafax/PKGBUILD b/staging/hylafax/PKGBUILD
deleted file mode 100644
index f00c0d884..000000000
--- a/staging/hylafax/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 147950 2012-01-29 02:47:19Z eric $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-pkgname=hylafax
-pkgver=6.0.5
-pkgrel=3
-pkgdesc="Fax Server"
-arch=('i686' 'x86_64')
-install='hylafax.install'
-license=('custom')
-depends=('libtiff' 'pam' 'ghostscript')
-makedepends=('smtp-server')
-url="http://www.hylafax.org/"
-backup=(var/spool/hylafax/bin/{faxrcvd,notify}
-	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
-	var/spool/hylafax/etc/hosts.hfaxd) 
-source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
-        hylafax 
-        hylafax.cron.daily 
-        config.local
-        configure-6.0.5.patch 
-        hylafax-libtiff4.patch)
-md5sums=('eb9ac942354ad708e20e4583cec6615f'
-         '6602288a405324d8c8e3c5eac2bf19fd'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a'
-         '51d9f639bb76e5e39cdc8e2ac07e208d'
-         '3d239c186f24720e945508d349b069b1')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  cp ../config.local .
-  # fix compiling
-  patch -Np0 -i ../configure-6.0.5.patch
-  patch -Np1 -i ../hylafax-libtiff4.patch
-  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
-  make
-}
-
-package () {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
-  mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
-  make ROOT="$pkgdir" install
-  install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax
-  install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
-  # add missing awk file for notify-4.1 script
-  install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
-  	"$pkgdir"/var/spool/hylafax/bin/notify.awk
-  # fix permission on /var/lock
-  chmod 1777 "$pkgdir"/var/lock
-
-  install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
-}
diff --git a/staging/hylafax/config.local b/staging/hylafax/config.local
deleted file mode 100644
index 0d8e2bcd8..000000000
--- a/staging/hylafax/config.local
+++ /dev/null
@@ -1,273 +0,0 @@
-# $Id: config.local,v 1.1 2003/06/28 00:24:49 jproctor Exp $
-#
-# HylaFAX Facsimile Software
-#
-# Copyright (c) 1990-1996 Sam Leffler
-# Copyright (c) 1991-1996 Silicon Graphics, Inc.
-# HylaFAX is a trademark of Silicon Graphics, Inc.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-
-#
-# This file holds site-specific configuration parameters.
-#
-# Nothing is defined in here by default, the definitions
-# commented out below serve as documentation for what you
-# can set in this file or a config.local file.
-#
-# Note that you do not need to set anything here unless you
-# want to override the auto-configuration behaviour and/or
-# interactive prompting done by the configure script.
-#
-
-#
-# Package controls.
-#
-#DSO="auto"			# configure DSO support (auto|IRIX|no)
-#GETTY="auto"			# type of getty support (auto|BSD|SysV)
-#HTML="no"			# install HTML documentation (yes|no)
-#PS="auto"			# PostScript support to use (auto|gs|dps|imp)
-#SGI2FAX="auto"			# configure SGI image support (auto|yes|no)
-#DPS="no"			# install SGI DPS-based RIP (yes|no)
-#GS="no"			# install Ghostscript RIP (yes|no)
-#IMP="no"			# install SGI Impressario 2.1 support (yes|no)
-#REGEX="yes"			# use distributed regular expression package
-#UTMP="utmpx"			# type of utmp+wtmp handling (auto|utmp|utmpx)
-#DBLIB="no"			# use distributed libdb distribution
-
-#
-# Directory parameters.
-#
-DIR_BIN="/usr/bin"		# directory for client apps
-DIR_LIB="/usr/lib"
-DIR_LIBDATA="/usr/lib/fax"		# directory for client data
-DIR_LIBEXEC="/usr/lib/fax"		# directory for libraries&hidden apps
-DIR_MAN="/usr/share/man"		# directory for manual pages
-DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
-DIR_SBIN="/usr/sbin"		# directory for system apps
-DIR_LOCKS="/var/lock"		# directory for UUCP lock files
-FONTMAP="/usr/share/ghostscript/fonts"	# directorys containing Fontmap files
-DIR_LOCALE="/usr/share/locale"
-#PATH_AFM="/usr/lib/DPS/AFM"		# directorys for AFM files
-
-#
-# HTML-specific parameters; only used when the
-# HTML package is configured for installation.
-#
-# Note that ``PATH''s are the virtual pathnames used
-# in forming URLs; they are not directory pathnames
-# in the filesystem.
-#
-DIR_HTML="/usr/share/hylafax/httpd"	# directory for HTML documentation
-#DIR_CGI="/var/httpd/cgi-bin"		# directory for CGI scripts
-#HTMLPATH="/hylafax"			# virtual path to HTML materials
-#CGIPATH="/cgi-bin"			# virtual path to CGI scripts
-
-#
-# Miscellaneous parameters.
-#
-#DEFVRES="196"				# default vertical res for outbound fax
-#FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
-#AXGID="uucp"				# group ID for fax user
-#FAXUID="uucp"				# user ID for fax user
-#PAGESIZE="North American Letter"	# default page size
-SYSGID="root"				# group ID for system installs
-SYSUID="root"				# user ID for system installs
-#LOCKS="ascii"				# default UUCP lockfile scheme
-#
-#PATH_GETTY="/etc/getty"		# pathname of suitable getty program
-#PATH_VGETTY="/bin/vgetty"		# pathname of voice getty program
-#PATH_EGETTY="/bin/egetty"		# pathname of external getty program
-#PATH_SENDMAIL="/usr/lib/sendmail"	# pathname of suitable sendmail program
-#PATH_GSRIP="/usr/local/bin/gs"		# pathname of Ghostscript-based RIP
-#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP
-#PATH_IMPRIP="/usr/lib/print/psrip"	# pathname of Impressario 2.1 RIP
-#MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
-#SYSVINIT="auto"		# install SysV-style init support (auto|yes|no)
-#DIR_SYSVINIT="/etc/init.d"	# location of SysV-style init script
-#DIR_SYSVINITSTART="../rc2.d"	# location of SysV-style start script
-#DIR_SYSVINITSTOP="../rc0.d"	# location of SysV-style stop script
-#NAME_SYSVINITSTART="S80fax"	# name of SysV-style start script
-#NAME_SYSVINITSTOP="K80fax"	# name of SysV-style stop script
-#FAXQ_SERVER=yes		# init script starts faxq
-#HFAXD_SERVER=yes		# init script starts hfaxd
-#HFAXD_OLD_PROTOCOL=no		# don't start old protocol
-#HFAXD_SNPP_SERVER=no		# don't start paging protocol
-
-# SVR4 packaging stuff
-#PKG_ARCH=				# ARCH variable in pkginfo file
-#PKG_EMAIL=someone@somehost.somedomain	# EMAIL variable in pkginfo file
-#PKG_VENDOR="Your Name Here"		# VENDOR variable in pkginfo file
-#
-
-#
-# Parameters used when building the software.
-#
-# Note that configure has several ENVOPTS built into it that are
-# set according to the target.  This is done to help naive folks.
-#
-# Beware of changing the INSTALL definition; you *must* have an
-# install script that emulates the Silicon Graphics install program!
-#
-#AR="/bin/ar"				# pathname of suitable ar program
-#AROPTS="rc"				# options to ar for creating archive
-#CC="gcc"				# name/pathname of C compiler
-#CXX="gcc"				# name/pathname of C++ compiler
-#CXXFILE="-x c++"			# options for proper C++ processing
-#ENVOPTS="-Aa"				# options for getting ANSI C
-#GCOPTS="-g"				# options to pass C compiler
-#GCXXOPTS="-g"				# options to pass C++ compiler
-#GENDIST="/sbin/gendist"		# pathname of SGI inst generator program
-#INSTALL='${SHELL} ${PORT}/install.sh'	# SGI install program/emulator
-#LIBMALLOC="auto"			# yes|no|auto configure -lmalloc use
-#LIBPORT='${PORT}/libport.a'		# library with emulation code
-#LIBSUN="auto"				# yes|no|auto configure -lsun use
-#LLDOPTS=""				# extra link line options
-#MACHDEPLIBS=""				# extra libraries for linking
-#PORTFUNCS=""				# non-standard functions to emulate
-#PROTOTYPES="-prototypes"		# C compiler options for checking function prototypes
-#RANLIB=":"				# pathname of suitable ranlib program
-#SHDLIBC="-lc_s"			# shared C library, if not standard
-#SIGHANDLERTYPES='(void(*)(int,...))'	# types to check for signal handler
-#STRIP="/bin/strip"			# strip program used by install.sh
-
-#
-# The source for the TIFF library is not required
-# to build this software, but the library is required
-# to link against.  If libtiff is installed in a
-# non-standard location then setup LIBTIFF accordingly.
-#
-#LIBTIFF="-L/usr/local/lib -ltiff"	# linkage convention for libtiff
-#TIFFINC="/usr/local/include"		# place to find tiffio.h
-#TIFFBIN="/usr/local/bin"		# where TIFF tools live
-
-#
-# The source for the ZLIB library is not required
-# to build this software, but the library is required
-# to link against.  If ZLIB is installed in a 
-# non-standard location then setup LIBZ accordingly.
-#
-#LIBZ="-L/usr/local/lib -lz"		# linkage convention for libz
-#ZLIBINC="-I/usr/local/include"		# place to find zlib.h
-
-#
-# The source for the POSIX regular expression package
-# is not required to build this software, but the package
-# is required to link against.  If the copy of the software
-# that is included in this distribution is not to be used
-# then set REGEX=no and supply the following definitions.
-#
-#LIBREGEX=" "				# linkage convention for regex package
-#REGEXINC="/usr/include"		# place to find regex.h
-
-#
-# The LIBDB hashed database package is (currently) used
-# only by the MLA tools that are not publicly available
-# but which are built from within this source tree.  In
-# the future the fax software may use the libdb software
-# for the remote client capabilities database (so these
-# hooks are included now).
-#
-# The source for the LIBDB hashed database package
-# is not required to build this software, but the package
-# is required to link against.  If the copy of the software
-# that is included in this distribution is not to be used
-# then set DBLIB=no and supply the following definitions.
-#
-#LIBDB=" "				# linkage convention for libdb package
-#DBLIBINC="/usr/include"		# place to find db.h
-
-#
-# Parameters to control various workarounds for system bugs.
-#
-# These parameters are normally set in configure based on
-# the target system.  If they are set here, then they will
-# override anything done by configure.
-#
-#CONFIG_OPENFIFO="O_RDONLY"		# mode to open FIFOs in server proc's
-#CONFIG_FIFOBUG="yes"			# enable workaround for FIFO select bug
-#CONFIG_TIOCMBISBYREF="yes"		# pass arg by reference to ioctl
-#CONFIG_WINSZHACK="no"			# include extra files for TIOCWINSZ use
-#CONFIG_ABORTBUG="no"			# enable workaround for abort problems
-#CONFIG_NOREOPEN="yes"			# reopen tty device after toggling DTR
-#CONFIG_NOSTDINDUP="yes"		# do not redirect stdout to stdin in ondelay
-#CONFIG_BADEXECVPROTO="no"		# system has incorrect execv func decl
-#CONFIG_BADEXECVEPROTO="no"		# system has incorrect execve func decl
-#CONFIG_BADGETOPTPROTO="no"		# system has incorrect getopt func decl
-#CONFIG_SOCKARGLENTYPE="unsigned long"	# call-by-ref arg type for socket funcs
-#CONFIG_BADSELECTPROTO="no"		# system has way old select func decl
-#CONFIG_MAXGID="5999"			# maximum permissable GID
-#CONFIG_OSFCNH="auto"			# control inclusion of <osfcn.h>
-
-#
-# Dynamic Shared Object (DSO) support.
-#
-# Beware that adding new support for DSOs may require some
-# modifications to the */Makefile.dso files.
-#
-#DSOSUF="so"				# DSO filename suffix
-#DSODELAY="-delay_load"			# DSO option for delayed loading
-#DSOOPTS="-shared -rdata_shared"	# options for building DSOs
-
-#
-# Makefile construction parameters.
-#
-# These should not normally be set; configure will
-# deduce the appropriate syntax to use for includes.
-#
-#MAKECXXOVERRIDE="=.C"			# make override stuff for SunPRO C++
-#MAKEDEPINCLUDE="include"		# make include for dependency files
-#MAKEDSOINCLUDE="#"			# make include for DSO support
-#MAKEINCLUDE=".include"			# make include syntax
-#MAKELQUOTE="<"				# make include syntax
-#MAKERQUOTE=">"				# make include syntax
-#SETMAKE='MAKE	= ${MAKE}'		# define if make does not setup $MAKE
-#MKDEPCOPTS=""				# C compiler opts to supply w/ -M
-#MKDEPCXXOPTS=""			# C++ compiler opts to supply w/ -M
-
-#
-# General system stuff used by the distribution.
-#
-# Beware of setting these as configure selects several programs
-# based on whether or not they are capable of processing scripts
-# included in the distribution (e.g AWK and SCRIPT_SH, SED).
-#
-#AWK="/bin/awk"				# pathname of suitable awk program
-#CAT="/bin/cat"				# pathname of suitable cat program
-#CHGRP="/etc/chgrp"			# pathname of suitable chgrp program
-#CHMOD="/etc/chmod"			# pathname of suitable chmod program
-#CHOWN="/etc/chown"			# pathname of suitable chown program
-#CMP="/bin/cmp"				# pathname of suitable cmp program
-#COL="/bin/col"				# pathname of suitable col program
-#CP="/bin/cp"				# pathname of suitable cp program
-#ECHO="/bin/echo"			# pathname of suitable echo program
-#GREP="/bin/grep"			# pathname of suitable grep program
-#LN="/bin/ln"				# pathname of suitable ln program
-#LN_S="-s"				# option to ${LN} to create symlink
-#MAN="/usr/bin/man"			# pathname of suitable man program
-#MKDIR="/bin/mkdir"			# pathname of suitable mkdir program
-#MKFIFO="/bin/mkfifo"			# pathname of suitable mkfifo program
-#MV="/bin/mv"				# pathname of suitable mv program
-#MV_F="-f"				# option to ${MV} to force operation
-#RMCMD="/bin/rm"			# pathname of suitable rm program
-#SED="/bin/sed"				# pathname of suitable sed program
-#SCRIPT_SH="/bin/sh"			# pathname of suitable shell
-#SORT="/bin/sort"			# pathname of suitable sort program
diff --git a/staging/hylafax/configure-6.0.5.patch b/staging/hylafax/configure-6.0.5.patch
deleted file mode 100644
index e1f1126a5..000000000
--- a/staging/hylafax/configure-6.0.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2011-08-08 10:19:37.619657223 +0200
-+++ configure	2011-08-08 10:20:26.422189170 +0200
-@@ -2882,7 +2882,7 @@
- 	echo '#define HAS_FCHMOD 1'
- 	Note "... configure use of fchmod"
- 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
--	    unistd.h libc.h $OSFCNH sys/stat.h
-+	    unistd.h $OSFCNH sys/stat.h libc.h
-     }
-     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
- 	unistd.h sys/stat.h
diff --git a/staging/hylafax/hylafax b/staging/hylafax/hylafax
deleted file mode 100755
index 9f949c2ac..000000000
--- a/staging/hylafax/hylafax
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="hylafax"
-FAXQ_BIN=/usr/sbin/faxq
-FAXQ_PID=`pidof -o %PPID $FAXQ_BIN`
-HFAXD_BIN=/usr/lib/fax/hfaxd
-HFAXD_PID=`pidof -o %PPID $HFAXD_BIN`
-HFAXD_OPTS="-i hylafax"
-FAXQUIT_BIN=/usr/sbin/faxquit
-
-. /var/spool/hylafax/etc/setup.cache
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ -z "$FAXQ_PID" ] && $FAXQ_BIN
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      echo `pidof -o %PPID $FAXQ_BIN` > /var/run/faxq.pid
-    fi
-    [ -z "$HFAXD_PID" ] && $HFAXD_BIN $HFAXD_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      echo `pidof -o %PPID $HFAXD_BIN` > /var/run/hfaxd.pid
-    fi
-    add_daemon $DAEMON_NAME
-    stat_done
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-	 $FAXQUIT_BIN >/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      [ ! -z "$FAXQ_PID" ]  && kill $FAXQ_PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        rm /var/run/faxq.pid &> /dev/null
-      fi
-    else
-      rm /var/run/faxq.pid &> /dev/null
-    fi
-    [ ! -z "$HFAXD_PID" ]  && kill $HFAXD_PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm /var/run/hfaxd.pid &> /dev/null
-    fi
-    rm_daemon $DAEMON_NAME
-    stat_done
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/staging/hylafax/hylafax-libtiff4.patch b/staging/hylafax/hylafax-libtiff4.patch
deleted file mode 100644
index 4a49511f8..000000000
--- a/staging/hylafax/hylafax-libtiff4.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- hylafax-6.0.5/configure	2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/configure	2012-01-02 17:44:20.000000000 -0500
-@@ -2531,6 +2566,7 @@
-     Note "... checking TIFF library version"
-     tiff_runlen_t=""
-     cat>t.c<<EOF
-+#include <stdlib.h>
- #include <stdio.h>
- #include "tiffio.h"
- main()
-@@ -2550,8 +2586,18 @@
- 	Note "  Found libtiff version ${lib_ver}"
- 	if [ ${header_ver} -ge 19960307 ]; then
- 	    case ${lib_ver} in
--		3.4)		tiff_runlen_t="uint16" ;;
--		3.[56789])	tiff_runlen_t="uint32" ;;
-+		3.4)		tiff_runlen_t="uint16"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+				echo '#define TIFFVERSION TIFF_VERSION'
-+				echo '#define TIFFHEADER TIFFHeader';;
-+		3.[56789])	tiff_runlen_t="uint32"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+				echo '#define TIFFVERSION TIFF_VERSION'
-+				echo '#define TIFFHEADER TIFFHeader';;
-+		4.0)		tiff_runlen_t="uint32"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint64'
-+				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
-+				echo '#define TIFFHEADER TIFFHeaderClassic';;
- 	    esac
- 	fi
-     else
-@@ -2588,7 +2634,7 @@
- Incompatible TIFF Library.
- 
- HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
--3.9.  If you do not have up to date TIFF software on your system
-+4.0.  If you do not have up to date TIFF software on your system
- then you can retrieve it from the location where you obtained this software.
- The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
- EOF
---- hylafax-6.0.5/hfaxd/FileTransfer.c++	2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-02 17:44:19.000000000 -0500
-@@ -164,26 +142,26 @@
-  * a single IFD/image from a TIFF file.
-  */
- typedef struct {
--    TIFFDirEntry	SubFileType;
--    TIFFDirEntry	ImageWidth;
--    TIFFDirEntry	ImageLength;
--    TIFFDirEntry	BitsPerSample;
--    TIFFDirEntry	Compression;
--    TIFFDirEntry	Photometric;
--    TIFFDirEntry	FillOrder;
--    TIFFDirEntry	StripOffsets;
--    TIFFDirEntry	Orientation;
--    TIFFDirEntry	SamplesPerPixel;
--    TIFFDirEntry	RowsPerStrip;
--    TIFFDirEntry	StripByteCounts;
--    TIFFDirEntry	XResolution;
--    TIFFDirEntry	YResolution;
--    TIFFDirEntry	Options;		// T4 or T6
--    TIFFDirEntry	ResolutionUnit;
--    TIFFDirEntry	PageNumber;
--    TIFFDirEntry	BadFaxLines;
--    TIFFDirEntry	CleanFaxData;
--    TIFFDirEntry	ConsecutiveBadFaxLines;
-+    HFClassicTIFFDirEntry	SubFileType;
-+    HFClassicTIFFDirEntry	ImageWidth;
-+    HFClassicTIFFDirEntry	ImageLength;
-+    HFClassicTIFFDirEntry	BitsPerSample;
-+    HFClassicTIFFDirEntry	Compression;
-+    HFClassicTIFFDirEntry	Photometric;
-+    HFClassicTIFFDirEntry	FillOrder;
-+    HFClassicTIFFDirEntry	StripOffsets;
-+    HFClassicTIFFDirEntry	Orientation;
-+    HFClassicTIFFDirEntry	SamplesPerPixel;
-+    HFClassicTIFFDirEntry	RowsPerStrip;
-+    HFClassicTIFFDirEntry	StripByteCounts;
-+    HFClassicTIFFDirEntry	XResolution;
-+    HFClassicTIFFDirEntry	YResolution;
-+    HFClassicTIFFDirEntry	Options;		// T4 or T6
-+    HFClassicTIFFDirEntry	ResolutionUnit;
-+    HFClassicTIFFDirEntry	PageNumber;
-+    HFClassicTIFFDirEntry	BadFaxLines;
-+    HFClassicTIFFDirEntry	CleanFaxData;
-+    HFClassicTIFFDirEntry	ConsecutiveBadFaxLines;
-     uint32		link;			// offset to next directory
-     uint32		xres[2];		// X resolution indirect value
-     uint32		yres[2];		// Y resolution indirect value
-@@ -226,10 +204,10 @@
- 		 * amount of image data and then adding in
- 		 * the expected data for the TIFF headers.
- 		 */
--		uint32* sb;
-+		TIFFSTRIPBYTECOUNTS* sb;
- 		TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
- 		file_size = sizeof (DirTemplate) +
--		    sizeof (TIFFHeader) + sizeof (uint16);
-+		    sizeof (TIFFHEADER) + sizeof (uint16);
- 		for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
- 		    file_size += sb[s];
- 		reply(code, "%s for %s (%lu bytes).",
-@@ -261,10 +239,10 @@
- 	if (fd >= 0) {
- 	    union {
- 		char buf[512];
--		TIFFHeader h;
-+		TIFFHEADER h;
- 	    } b;
- 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
--	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
-+	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
- 	      (b.h.tiff_magic == TIFF_BIGENDIAN ||
- 	       b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
- 		(void) lseek(fd, 0L, SEEK_SET);		// rewind
-@@ -318,12 +296,12 @@
- }
- 
- static void
--getLong(TIFF* tif, TIFFDirEntry& de)
-+getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
-     TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
- }
- static void
--getShort(TIFF* tif, TIFFDirEntry& de)
-+getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
-     uint16 v;
-     TIFFGetField(tif, de.tdir_tag, &v);
-@@ -343,7 +321,7 @@
- {
-     static DirTemplate templ = {
- #define	TIFFdiroff(v) \
--    (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
-+    (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
-       (intptr_t) &(((DirTemplate*) 0)->v))
- 	{ TIFFTAG_SUBFILETYPE,		TIFF_LONG,	1 },
- 	{ TIFFTAG_IMAGEWIDTH,		TIFF_LONG,	1 },
-@@ -368,7 +346,7 @@
- 	0,					// next directory
- 	{ 0, 1 }, { 0, 1 },			// x+y resolutions
-     };
--#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
-+#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
-     /*
-      * Construct the TIFF header for this IFD using
-      * the preconstructed template above.  We extract
-@@ -377,14 +355,14 @@
-      * of things about the contents of the TIFF file.
-      */
-     struct {
--	TIFFHeader h;
-+	TIFFHEADER h;
- 	uint16	dircount;
- 	u_char	dirstuff[sizeof (templ)];
-     } buf;
-     union { int32 i; char c[4]; } u; u.i = 1;
-     buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
--    buf.h.tiff_version = TIFF_VERSION;
--    buf.h.tiff_diroff = sizeof (TIFFHeader);
-+    buf.h.tiff_version = TIFFVERSION;
-+    buf.h.tiff_diroff = sizeof (TIFFHEADER);
-     buf.dircount = (uint16) NTAGS;
-     getLong(tif, templ.SubFileType);
-     getLong(tif, templ.ImageWidth);
-@@ -412,7 +390,7 @@
-     getShort(tif, templ.CleanFaxData);
-     getLong(tif, templ.ConsecutiveBadFaxLines);
-     if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
--	TIFFDirEntry* dp = &templ.SubFileType;
-+	HFClassicTIFFDirEntry* dp = &templ.SubFileType;
- 	for (u_int i = 0; i < NTAGS; i++) {
- 	    if (dp->tdir_type == TIFF_SHORT)
- 		dp->tdir_offset <<= 16;
-@@ -441,7 +419,7 @@
- bool
- HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
- {
--    uint32* sb;
-+    TIFFSTRIPBYTECOUNTS* sb;
-     (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
-     tdata_t buf = _TIFFmalloc(sb[0]);
-     tsize_t bsize = sb[0];
---- hylafax-6.0.5/hfaxd/FileTransfer.c++	2012-01-28 15:27:47.000000000 -0500
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-28 15:30:12.000000000 -0500
-@@ -69,7 +69,7 @@
- 
- 
- static bool
--isTIFF(const TIFFHeader& h)
-+isTIFF(const TIFFHEADER& h)
- {
-     if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
- 	return (false);
-@@ -82,11 +82,23 @@
-     // byte swap version stamp if opposite byte order
-     if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
- 	TIFFSwabShort(&version);
--    return (version == TIFF_VERSION);
-+    return (version == TIFFVERSION);
- }
- 
- 
- /*
-+ * This is copied right from tiff.h in version 3.8.2.  This was necessary
-+ * to localize here because it was removed from tiff.h in version 4.0.
-+ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
-+ */
-+typedef struct {
-+	uint16		tdir_tag;
-+	uint16		tdir_type;	/* data type */
-+	uint32		tdir_count;	/* number of items; length in spec */
-+	uint32		tdir_offset;	/* byte offset to field data */
-+} HFClassicTIFFDirEntry;
-+ 
-+/*
-  * Record a file transfer in the log file.
-  */
- void
-@@ -957,7 +957,7 @@
- 	if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
- 	    union {
- 		char buf[512];
--		TIFFHeader h;
-+		TIFFHEADER h;
- 	    } b;
- 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
- 	    if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
diff --git a/staging/hylafax/hylafax.cron.daily b/staging/hylafax/hylafax.cron.daily
deleted file mode 100644
index 2d1a77e5c..000000000
--- a/staging/hylafax/hylafax.cron.daily
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/sbin/faxqclean
-/usr/sbin/faxcron -rcv 30
diff --git a/staging/hylafax/hylafax.install b/staging/hylafax/hylafax.install
deleted file mode 100644
index 5dacf4045..000000000
--- a/staging/hylafax/hylafax.install
+++ /dev/null
@@ -1,46 +0,0 @@
-
-print_install() {
-  printf "\n"
-  echo "Add the following to /etc/inittab and run telinit q"
-  echo "  f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0"
-  echo "faxgetty should now be running"
-  printf "\n"
-  echo "Run faxsetup to configure and be sure to set..."
-  echo "  The device to configure is usually ttyS0"
-  echo "  The number of pages to accept to more than 25"
-  echo "  The country code and area code"
-  echo "  The faxclass to 2.0"
-  echo "  Most other defaults are OK"
-  printf "\n"
-}
-
-print_remove() {
-  printf "\n\n"
-  echo "You may manually remove /var/spool/hylafax and /usr/lib/fax if you do not need anything."
-  echo "You may also remove any aliases added to /etc/mail/aliases."
-  printf "\n"
-}
-
-post_install() {
-  post_upgrade
-  print_install
-}
-
-post_upgrade() {
-  groupadd -g 14 uucp &>/dev/null
-  useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
-  useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
-  chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
-  chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
-  chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
-  chown -R uucp /var/spool/hylafax/etc/templates
-  usermod -d '/' uucp &>/dev/null
-  usermod -d '/' fax &>/dev/null
-}
-
-pre_remove() {
-  userdel uucp &>/dev/null
-  groupdel uucp &>/dev/null
-  userdel fax &>/dev/null
-  print_remove
-}
diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD
deleted file mode 100644
index 91331d359..000000000
--- a/staging/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 146973 2012-01-19 20:16:27Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.4.7
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('87cde464a569d8b34ef8edae817fbe4f51f8c2d0'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf
-  patch -p0 -i ../perlmagick.rpath.patch
-
-  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
-    ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
-    --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" \
-    --without-gvc --without-djvu --without-autotrace --without-webp \
-    --without-jbig --without-fpx --without-dps --without-fftw --without-lqr
-  make
-}
-
-check() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  optdepends=('ghostscript: for Ghostscript support' 
-              'openexr: for OpenEXR support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
-              'libpng: for PNG support')
-  backup=('etc/ImageMagick/coder.xml'
-          'etc/ImageMagick/colors.xml'
-          'etc/ImageMagick/delegates.xml'
-          'etc/ImageMagick/log.xml'
-          'etc/ImageMagick/magic.xml'
-          'etc/ImageMagick/mime.xml'
-          'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/sRGB.icc'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
-  options=('!makeflags' '!docs' 'libtool')
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  find "${pkgdir}" -name '*.bs' -delete
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
-  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-  depends=()
-  options=('!makeflags')
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/staging/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/staging/imlib/CAN-2004-1026.patch b/staging/imlib/CAN-2004-1026.patch
deleted file mode 100644
index c820270d4..000000000
--- a/staging/imlib/CAN-2004-1026.patch
+++ /dev/null
@@ -1,510 +0,0 @@
-diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c
---- imlib-1.9.13.orig/Imlib/load.c	Wed Mar 13 19:06:29 2002
-+++ imlib-1.9.13/Imlib/load.c	Thu Sep 16 17:21:01 2004
-@@ -4,6 +4,8 @@
- #include "Imlib_private.h"
- #include <setjmp.h>
- 
-+#define G_MAXINT ((int) 0x7fffffff)
-+
- /*      Split the ID - damages input    */
- 
- static char        *
-@@ -41,13 +43,17 @@
- 
- /*
-  *     Make sure we don't wrap on our memory allocations
-+ *     we check G_MAXINT/4 because rend.c malloc's w * h * bpp
-+ *     + 3 is safety margin
-  */
- 
- void * _imlib_malloc_image(unsigned int w, unsigned int h)
- {
--       if( w > 32767 || h > 32767)
--               return NULL;
--       return malloc(w * h * 3);
-+       if (w <= 0 || w > 32767 ||
-+           h <= 0 || h > 32767 ||
-+           h >= (G_MAXINT/4 - 1) / w)
-+                return NULL;
-+       return malloc(w * h * 3 + 3);
- }
- 
- #ifdef HAVE_LIBJPEG
-@@ -360,7 +366,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-        TIFFClose(tif);
-        return NULL;
-@@ -463,7 +471,7 @@
- 	    }
- 	  *w = gif->Image.Width;
- 	  *h = gif->Image.Height;
--	  if (*h > 32767 || *w > 32767)
-+	  if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
- 	    {
- 	       return NULL;
- 	    }
-@@ -965,7 +973,12 @@
-   comment = 0;
-   quote = 0;
-   context = 0;
-+  memset(lookup, 0, sizeof(lookup));
-+
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -994,25 +1007,25 @@
- 		{
- 		  /* Header */
- 		  sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--                  if (ncolors > 32766)
-+                  if (ncolors <= 0 || ncolors > 32766)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (cpp > 5)
-+		  if (cpp <= 0 || cpp > 5)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*w > 32767)
-+		  if (*w <= 0 || *w > 32767)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*h > 32767)
-+		  if (*h <= 0 || *h > 32767)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
- 		      free(line);
-@@ -1045,11 +1058,13 @@
- 		    {
- 		      int                 slen;
- 		      int                 hascolor, iscolor;
-+		      int                 space;
- 
- 		      iscolor = 0;
- 		      hascolor = 0;
- 		      tok[0] = 0;
- 		      col[0] = 0;
-+		      space = sizeof(col) - 1;
- 		      s[0] = 0;
- 		      len = strlen(line);
- 		      strncpy(cmap[j].str, line, cpp);
-@@ -1072,10 +1087,10 @@
- 				{
- 				  if (k >= len)
- 				    {
--				      if (col[0])
--					strcat(col, " ");
--                                      if (strlen(col) + strlen(s) < sizeof(col))
--					strcat(col, s);
-+				      if (col[0] && space > 0)
-+					strcat(col, " "), space -= 1;
-+                                      if (slen <= space)
-+					strcat(col, s), space -= slen;
- 				    }
- 				  if (col[0])
- 				    {
-@@ -1105,14 +1120,17 @@
- 					    }
- 					}
- 				    }
--				  strcpy(tok, s);
-+				  if (slen < sizeof(tok));
-+				    strcpy(tok, s);
- 				  col[0] = 0;
-+				  space = sizeof(col) - 1;
- 				}
- 			      else
- 				{
--				  if (col[0])
--				    strcat(col, " ");
--				  strcat(col, s);
-+				  if (col[0] && space > 0)
-+				    strcat(col, " "), space -=1;
-+				  if (slen <= space)
-+				    strcat(col, s), space -= slen;
- 				}
- 			    }
- 			}
-@@ -1341,12 +1359,12 @@
- 	  sscanf(s, "%i %i", w, h);
- 	  a = *w;
- 	  b = *h;
--	  if (a > 32767)
-+	  if (a <= 0 || a > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
- 	      return NULL;
- 	    }
--	  if (b > 32767)
-+	  if (b <= 0 || b > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
- 	      return NULL;
-diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c
---- imlib-1.9.13.orig/Imlib/utils.c	Mon Mar  4 17:45:28 2002
-+++ imlib-1.9.13/Imlib/utils.c	Thu Sep 16 17:21:15 2004
-@@ -1496,36 +1496,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+	break;
-+      line = strdup(line);
-+      if (!line)
-+	break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+	{
-+	  c = line[i];
-+	  if (c < 32)
-+	    line[i] = 32;
-+	  else if (c > 127)
-+	    line[i] = 127;
-+	}
-+
-       if (context == 0)
- 	{
- 	  /* Header */
- 	  sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--	  if (ncolors > 32766)
-+	  if (ncolors <= 0 || ncolors > 32766)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (cpp > 5)
-+	  if (cpp <= 0 || cpp > 5)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (w > 32767)
-+	  if (w <= 0 || w > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (h > 32767)
-+	  if (h <= 0 || h > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1533,6 +1553,7 @@
- 	  if (!cmap)
- 	    {
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->rgb_width = w;
-@@ -1542,6 +1563,7 @@
- 	    {
- 	      free(cmap);
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->alpha_data = NULL;
-@@ -1817,6 +1839,7 @@
- 	}
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
- 	done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c
---- imlib-1.9.13.orig/gdk_imlib/io-gif.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-gif.c	Thu Sep 16 16:11:31 2004
-@@ -55,7 +55,7 @@
- 	    }
- 	  *w = gif->Image.Width;
- 	  *h = gif->Image.Height;
--	  if(*h > 32767 || *w > 32767)
-+	  if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
- 	    {
- 	      return NULL;
- 	    }
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c
---- imlib-1.9.13.orig/gdk_imlib/io-ppm.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-ppm.c	Thu Sep 16 16:13:13 2004
-@@ -53,12 +53,12 @@
- 	  sscanf(s, "%i %i", w, h);
- 	  a = *w;
- 	  b = *h;
--	  if (a > 32767)
-+	  if (a <= 0 || a > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
- 	      return NULL;
- 	    }
--	  if (b > 32767)
-+	  if (b <= 0 || b > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
- 	      return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c
---- imlib-1.9.13.orig/gdk_imlib/io-tiff.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-tiff.c	Thu Sep 16 16:13:57 2004
-@@ -36,7 +36,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-       TIFFClose(tif);
-       return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c
---- imlib-1.9.13.orig/gdk_imlib/io-xpm.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-xpm.c	Thu Sep 16 17:08:24 2004
-@@ -40,8 +40,12 @@
-   context = 0;
-   i = j = 0;
-   cmap = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -70,25 +74,25 @@
- 		{
- 		  /* Header */
- 		  sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--		  if (ncolors > 32766)
-+		  if (ncolors <= 0 || ncolors > 32766)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (cpp > 5)
-+		  if (cpp <= 0 || cpp > 5)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*w > 32767)
-+		  if (*w <= 0 || *w > 32767)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*h > 32767)
-+		  if (*h <= 0 || *h > 32767)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
- 		      free(line);
-@@ -120,11 +124,13 @@
- 		    {
- 		      int                 slen;
- 		      int                 hascolor, iscolor;
-+		      int                 space;
- 
- 		      hascolor = 0;
- 		      iscolor = 0;
- 		      tok[0] = 0;
- 		      col[0] = 0;
-+		      space = sizeof(col) - 1;
- 		      s[0] = 0;
- 		      len = strlen(line);
- 		      strncpy(cmap[j].str, line, cpp);
-@@ -147,10 +153,10 @@
- 				{
- 				  if (k >= len)
- 				    {
--				      if (col[0])
--					strcat(col, " ");
--				      if (strlen(col) + strlen(s) < sizeof(col))
--					strcat(col, s);
-+				      if (col[0] && space > 0)
-+					strncat(col, " ", space), space -= 1;
-+				      if (slen <= space)
-+					strcat(col, s), space -= slen;
- 				    }
- 				  if (col[0])
- 				    {
-@@ -180,14 +186,17 @@
- 					    }
- 					}
- 				    }
--				  strcpy(tok, s);
-+				  if (slen < sizeof(tok))
-+				    strcpy(tok, s);
- 				  col[0] = 0;
-+				  space = sizeof(col) - 1;
- 				}
- 			      else
- 				{
--				  if (col[0])
--				    strcat(col, " ");
--				  strcat(col, s);
-+				  if (col[0] && space > 0)
-+				    strcat(col, " "), space -= 1;
-+				  if (slen <= space)
-+				    strcat(col, s), space -= slen;
- 				}
- 			    }
- 			}
-diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c
---- imlib-1.9.13.orig/gdk_imlib/misc.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/misc.c	Thu Sep 16 16:35:32 2004
-@@ -1355,11 +1355,16 @@
- 
- /*
-  *	Make sure we don't wrap on our memory allocations
-+ *	we check G_MAX_INT/4 because rend.c malloc's w * h * bpp
-+ *	+ 3 is safety margin
-  */
- 
- void *_gdk_malloc_image(unsigned int w, unsigned int h)
- {
--	if( w > 32767 || h > 32767)
-+	if (w <= 0 || w > 32767 ||
-+	    h <= 0 || h > 32767 ||
-+	    h >= (G_MAXINT/4 - 1) / w)
- 		return NULL;
--	return malloc(w * h * 3);
-+	return malloc(w * h * 3 + 3);
- }
-+
-diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c
---- imlib-1.9.13.orig/gdk_imlib/utils.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/utils.c	Thu Sep 16 17:28:35 2004
-@@ -1236,36 +1236,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+	break;
-+      line = strdup(line);
-+      if (!line)
-+	break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+        {
-+	  c = line[i];
-+	  if (c < 32)
-+	    line[i] = 32;
-+	  else if (c > 127)
-+	    line[i] = 127;
-+	}
-+
-       if (context == 0)
- 	{
- 	  /* Header */
- 	  sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--	  if (ncolors > 32766)
-+	  if (ncolors <= 0 || ncolors > 32766)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (cpp > 5)
-+	  if (cpp <= 0 || cpp > 5)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (w > 32767)
-+	  if (w <= 0 || w > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (h > 32767)
-+	  if (h <= 0 || h > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1273,6 +1293,7 @@
- 	  if (!cmap)
- 	    {
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->rgb_width = w;
-@@ -1282,6 +1303,7 @@
- 	    {
- 	      free(cmap);
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->alpha_data = NULL;
-@@ -1355,7 +1377,7 @@
- 				  strcpy(col + colptr, " ");
- 				  colptr++;
- 				}
--			      if (colptr + ls <= sizeof(col))
-+			      if (colptr + ls < sizeof(col))
- 				{
- 				  strcpy(col + colptr, s);
- 				  colptr += ls;
-@@ -1558,6 +1580,7 @@
- 	}
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
- 	done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
diff --git a/staging/imlib/PKGBUILD b/staging/imlib/PKGBUILD
deleted file mode 100644
index a24025502..000000000
--- a/staging/imlib/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 146849 2012-01-18 20:31:10Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=imlib
-pkgver=1.9.15
-pkgrel=11
-pkgdesc="General image handling library for X11 and Gtk"
-arch=('i686' 'x86_64')
-url="http://freshmeat.net/projects/imlib/"
-license=('GPL')
-depends=('gtk' 'giflib' 'libpng' 'libtiff')
-makedepends=('libxt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
-        debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch)
-sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
-          'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
-          'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
-          'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
-          '33c3aaa43eb624f2a6ab0406285a8515903333e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/debian-bug448360.patch"
-  patch -p1 -i "${srcdir}/CAN-2004-1026.patch"
-  patch -p0 -i "${srcdir}/aclocal-fixes.patch"
-  patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
-  libtoolize --force
-  cp /usr/bin/libtool .
-  autoreconf --force --install
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/imlib/aclocal-fixes.patch b/staging/imlib/aclocal-fixes.patch
deleted file mode 100644
index 04ef737e7..000000000
--- a/staging/imlib/aclocal-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- imlib.m4.orig	2006-03-05 12:41:14.000000000 +0000
-+++ imlib.m4	2006-03-05 12:44:15.000000000 +0000
-@@ -6,7 +6,7 @@
- dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
- dnl
--AC_DEFUN(AM_PATH_IMLIB,
-+AC_DEFUN([AM_PATH_IMLIB],
- [dnl 
- dnl Get the cflags and libraries from the imlib-config script
- dnl
-@@ -164,7 +164,7 @@
- ])
- 
- # Check for gdk-imlib
--AC_DEFUN(AM_PATH_GDK_IMLIB,
-+AC_DEFUN([AM_PATH_GDK_IMLIB],
- [dnl 
- dnl Get the cflags and libraries from the imlib-config script
- dnl
diff --git a/staging/imlib/debian-bug448360.patch b/staging/imlib/debian-bug448360.patch
deleted file mode 100644
index f1c0ef111..000000000
--- a/staging/imlib/debian-bug448360.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c
---- imlib-1.9.15.orig/gdk_imlib/misc.c	2002-03-04 18:06:32.000000000 +0100
-+++ imlib-1.9.15/gdk_imlib/misc.c	2007-10-28 14:00:04.000000000 +0100
-@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams
-   visual = gdk_rgb_get_visual();
-   id->x.visual = GDK_VISUAL_XVISUAL(visual);	/* the visual type */
-   id->x.depth = visual->depth;	/* the depth of the screen in bpp */
-+
-+  id->x.shm = 0;
-+  id->x.shmp = 0;
-+  id->max_shm = 0;
- #ifdef HAVE_SHM
-   if (XShmQueryExtension(id->x.disp))
-     {
-@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams
- 	      id->x.last_xim = NULL;
- 	      id->x.last_sxim = NULL;
- 	      id->max_shm = 0x7fffffff;
--	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
-+	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
-+		  (pm == True))
- 		id->x.shmp = 1;
- 	    }
- 	}
-     }
--  else
- #endif
--    {
--      id->x.shm = 0;
--      id->x.shmp = 0;
--    }
-+
-   id->cache.on_image = 0;
-   id->cache.size_image = 0;
-   id->cache.num_image = 0;
-@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams
- 	}
-       if (p->flags & PARAMS_SHAREDPIXMAPS)
- 	{
--	  if (id->x.shm)
--	    id->x.shmp = p->sharedpixmaps;
-+	  if (!p->sharedpixmaps)
-+	    id->x.shmp = 0;
- 	}
-       if (p->flags & PARAMS_PALETTEOVERRIDE)
- 	override = p->paletteoverride;
-diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c
---- imlib-1.9.15.orig/Imlib/misc.c	2004-09-21 02:22:59.000000000 +0200
-+++ imlib-1.9.15/Imlib/misc.c	2007-10-28 14:00:23.000000000 +0100
-@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I
-   id->x.root = DefaultRootWindow(disp);		/* the root window id */
-   id->x.visual = DefaultVisual(disp, id->x.screen);	/* the visual type */
-   id->x.depth = DefaultDepth(disp, id->x.screen);	/* the depth of the screen in bpp */
-+
-+  id->x.shm = 0;
-+  id->x.shmp = 0;
-+  id->max_shm = 0;
- #ifdef HAVE_SHM
-   if (XShmQueryExtension(id->x.disp))
-     {
-@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I
- 	      id->x.last_xim = NULL;
- 	      id->x.last_sxim = NULL;
- 	      id->max_shm = 0x7fffffff;
--	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
-+	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
-+		   (pm == True)))
- 		id->x.shmp = 1;
- 	    }
- 	}
-     }
--  else
- #endif
--    {
--      id->x.shm = 0;
--      id->x.shmp = 0;
--    }
-+
-   id->cache.on_image = 0;
-   id->cache.size_image = 0;
-   id->cache.num_image = 0;
-@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I
- 	}
-       if (p->flags & PARAMS_SHAREDPIXMAPS)
- 	{
--	  if (id->x.shm)
--	    id->x.shmp = p->sharedpixmaps;
-+	  if (!p->sharedpixmaps)
-+	    id->x.shmp = 0;
- 	}
-       if (p->flags & PARAMS_PALETTEOVERRIDE)
- 	override = p->paletteoverride;
diff --git a/staging/imlib/imlib-1.9.15-libpng15.patch b/staging/imlib/imlib-1.9.15-libpng15.patch
deleted file mode 100644
index 7837cd488..000000000
--- a/staging/imlib/imlib-1.9.15-libpng15.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- gdk_imlib/io-png.c
-+++ gdk_imlib/io-png.c
-@@ -40,13 +40,13 @@
-       return NULL;
-     }
- 
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
- 
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -275,13 +275,13 @@
-       return NULL;
-     }
-   
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
-   
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -301,6 +301,9 @@
-   /* Setup Translators */
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-     png_set_expand(png_ptr);
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-+    png_set_expand(png_ptr);
-+
-   png_set_strip_16(png_ptr);
-   png_set_packing(png_ptr);
-   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-@@ -440,13 +443,13 @@
- 		return NULL;
- 	}
- 	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		return NULL;
- 	}
- 	
--	if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		return NULL;
-@@ -635,7 +638,7 @@
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	      return 0;
- 	    }
--	  if (setjmp(png_ptr->jmpbuf))
-+	  if (setjmp(png_jmpbuf(png_ptr)))
- 	    {
- 	      fclose(f);
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
---- Imlib/load.c
-+++ Imlib/load.c
-@@ -197,12 +197,12 @@
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -260,7 +260,8 @@
-   png_read_image(png_ptr, lines);
-   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-   ptr = data;
--  if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+  if (color_type == PNG_COLOR_TYPE_GRAY
-+      || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-       for (y = 0; y < *h; y++)
- 	{
-@@ -285,6 +286,7 @@
- 	    }
- 	}
-     }
-+#if 0
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-     {
-       for (y = 0; y < *h; y++)
-@@ -300,6 +302,7 @@
- 	    }
- 	}
-     }
-+#endif
-   else
-     {
-       for (y = 0; y < *h; y++)
---- Imlib/save.c
-+++ Imlib/save.c
-@@ -342,7 +342,7 @@
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	      return 0;
- 	    }
--	  if (setjmp(png_ptr->jmpbuf))
-+	  if (setjmp(png_jmpbuf(png_ptr)))
- 	    {
- 	      fclose(f);
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
---- Imlib/utils.c
-+++ Imlib/utils.c
-@@ -1981,14 +1981,13 @@
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))  
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
-   
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/staging/imlib2/PKGBUILD b/staging/imlib2/PKGBUILD
deleted file mode 100644
index 33e0b8bca..000000000
--- a/staging/imlib2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 147170 2012-01-23 21:18:18Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Arjan Timmerman <arjan.archlinux.org>
-# Contributor: Tom Newsom <Jeepster.gmx.co.uk>
-
-pkgname=imlib2
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
-url="http://sourceforge.net/projects/enlightenment/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # disable optimizations, they cause problems (e.g. FS#12268)
-  [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx"
-  [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64"
-
-  # Configure and Build
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/imlib2 \
-              --x-libraries=/usr/lib $EXTRAOPTS
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Install License
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD
deleted file mode 100644
index b2adc74f2..000000000
--- a/staging/inkscape/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 147200 2012-01-24 06:18:56Z bisson $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.2
-pkgrel=6
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-makedepends=('boost' 'pkg-config' 'intltool')
-depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2'
-         'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python-lxml: some extensions and filters'
-            'pyxml: some extensions'
-            'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'libpng15.patch')
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3'
-          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
-	sed -i 's|"python"|"python2"|g' src/main.cpp
-
-	patch -p1 -i ../libpng15.patch
-
-	./configure --prefix=/usr \
-		--with-python \
-		--with-perl \
-		--without-gnome-vfs \
-		--with-xft \
-		--enable-lcms \
-		--enable-poppler-cairo \
-		--disable-dependency-tracking \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/inkscape/install b/staging/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/staging/inkscape/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch
deleted file mode 100644
index e24913ed6..000000000
--- a/staging/inkscape/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/staging/java7-openjdk/PKGBUILD b/staging/java7-openjdk/PKGBUILD
deleted file mode 100644
index b5ab884cb..000000000
--- a/staging/java7-openjdk/PKGBUILD
+++ /dev/null
@@ -1,346 +0,0 @@
-# $Id: PKGBUILD 147010 2012-01-20 18:19:59Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
-
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') 
- # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
-pkgbase=java7-openjdk
-_java_ver=7
-_openjdk_build=b147
-_openjdk_date=27_jun_2011
-_icedtea_ver=2.0
-_date=20110922
-
-# check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=4d9e4fb8af09
-_HOTSPOT_CHANGESET=b28ae681bae0
-_JAXP_CHANGESET=948e734135ea
-_JAXWS_CHANGESET=a2ebfdc9db7e
-_JDK_CHANGESET=2054526dd141
-_LANGTOOLS_CHANGESET=9b85f1265346
-_OPENJDK_CHANGESET=0a76e5390e68
-
-_bootstrap=0 # 0/1 for quick build or full bootstrap
-
-pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=6
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org"
-license=('custom')
-options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
-             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
-[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
-
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
-        ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
-        ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
-        ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz					# jaxws.tar.gz
-        ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
-        ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
-        ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
-        fontconfig-paths.diff
-        fix_corba_cmds_path.diff
-        openjdk7_fix_jdk_cmds_path.diff
-        openjdk7_nonreparenting-wm.diff
-        jdk7-openjdk.profile
-        jdk7-openjdk.profile.csh
-        jre7-openjdk.profile
-        jre7-openjdk.profile.csh
-        glibc2_15.diff)
-md5sums=('752721a037a625001fad7a5fc2013f60'
-         '4c34ddf70124ea90c79201c1afede3e3'
-         '8f8d222d0a6d363d06b40576da5f1ea2'
-         '4abf34372e34cccd74ad337e487ed790'
-         'f2f40590a83889b8aa1d4631b705092d'
-         'd3beed0118bbd93d4651af762eb748c7'
-         'c8617700b4bd6cd5de1257bc36509bed'
-         'f10b711b0c784df8707808d9d0f52abd'
-         'ee1afda124d5927345014ab382ef581e'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'c195c4865b84d9e2e0fd71ac6d88eadb'
-         '203640d6e79e41b0065e016818c17ccd'
-         'b7b8996448c7b4fa7dd2d744488ed3bd'
-         'cdabafad0ec413d9a983888bf445a443'
-         '612b0fec7e0943c37a6de77c43622007'
-         '62443459da0cb28181feb260dc0e5ce7'
-         'a4293acadff03bdccbc9b412ad288549')
-
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
-           "${_CORBA_CHANGESET}.tar.gz"
-           "${_JAXP_CHANGESET}.tar.gz"
-           "${_JAXWS_CHANGESET}.tar.gz"
-           "${_JDK_CHANGESET}.tar.gz"
-           "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz")
-
-  _jvmdir=/usr/lib/jvm/java-7-openjdk
-  
-  [ "$CARCH" = "x86_64" ] && _JARCH=amd64
-  [ "$CARCH" = "i686" ] && _JARCH=i386
-  
-build() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-
-  unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-  
-  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
-  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
-  
-  unset MAKEFLAGS # parallel build is currently broken 
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-
-  . /etc/profile.d/apache-ant.sh
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/glibc2_15.diff"
-
-  if [ "$_bootstrap" = "1" ]; then
-     BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
-   else 
-     BOOTSTRAPOPT="--disable-bootstrap"
-  fi
-
-  ./configure \
-	$BOOTSTRAPOPT \
-        --with-parallel-jobs="${MAKEFLAGS/-j}" \
-        --disable-tests \
-        --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
-        --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
-        --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
-        --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
-        --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
-        --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
-        --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
-        --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
-        --enable-pulse-java \
-        --enable-nss \
-        --with-rhino
-	#--help
-
-#     --enable-systemtap      Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed
-  
-  make
-}
-
-check() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-  make -k check
-}
-
-package_jre7-openjdk-headless() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
-  depends=('libjpeg-turbo' 'lcms2' 'nss'
-           'ca-certificates-java' 'rhino')
-  optdepends=('libcups: needed for Java Mauve support - libmawt.so'
-              'fontconfig: needed for Java Mauve support - libmawt.so')
-  provides=('java-runtime=7')
-  conflicts=('java-runtime' 'openjdk6')
-  #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
-  backup=(etc/profile.d/jre.sh
-          etc/profile.d/jre.csh
-          etc/java-7-openjdk/calendars.properties
-          etc/java-7-openjdk/content-types.properties
-          etc/java-7-openjdk/cursors/cursors.properties
-          etc/java-7-openjdk/flavormap.properties
-          etc/java-7-openjdk/fontconfig.bfc
-          etc/java-7-openjdk/fontconfig.properties
-          etc/java-7-openjdk/jvm.cfg
-          etc/java-7-openjdk/logging.properties
-          etc/java-7-openjdk/management/jmxremote.access
-          etc/java-7-openjdk/management/jmxremote.password
-          etc/java-7-openjdk/management/management.properties
-          etc/java-7-openjdk/management/snmp.acl
-          etc/java-7-openjdk/net.properties
-          etc/java-7-openjdk/psfont.properties.ja
-          etc/java-7-openjdk/psfontj2d.properties
-          etc/java-7-openjdk/security/java.policy
-          etc/java-7-openjdk/security/java.security
-          etc/java-7-openjdk/security/nss.cfg
-          etc/java-7-openjdk/sound.properties
-          etc/java-7-openjdk/tz.properties)
-  install=jre7-openjdk-headless.install
-
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
-  mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties
-  mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc
-  rm -f lib/fontconfig.*.bfc
-  rm -f lib/fontconfig.*.properties.src 
-  rm -f lib/fontconfig.properties.src
-
-  install -d -m755 ${pkgdir}/${_jvmdir}/jre/
-  cp -a bin lib ${pkgdir}/${_jvmdir}/jre
-
-  # Install man pages
-  pushd ../../j2re-image/man
-  install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
-  install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
-  install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
-  popd
-
-  # more files that belong to the desktop package
-  mkdir ${srcdir}/tmp-desktop-jre
-  for file in \
-	"/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \
-	"/usr/share/man/ja/man1/policytool.1" \
-	"/usr/share/man/man1/policytool.1"; do
-     dirname=`dirname $file`
-     install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true
-     # mv file from fakeinstall to pkgdir
-     mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file
-  done
-  rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt
-
-  # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
-  for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
-  done
-  popd
-
-  # Link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
-
-  # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh
-  install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh
-
-  # Install license
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
-  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
-                 ${pkgdir}/usr/share/licenses/${pkgbase}
-		 
-  # Put some more files under backup control
-  install -m755 -d ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
-  # install dummy links to make them found by JAVA
-  cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/
-  for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do
-    ln -vsf /etc/java-7-openjdk/`basename $file` .
-  done
-  # some more
-  install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security}
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/
-    ln -vsf /etc/java-7-openjdk/cursors/cursors.properties .
-  popd
-  mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password
-  mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management
-    ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} .
-  popd
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security
-    ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} .
-  popd
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/
-     ln -vsf /etc/java-7-openjdk/jvm.cfg .
-  popd
-}
-	 
-package_jre7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs"
-  depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
-  optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
-             'alsa-lib: for basic sound support'
-             'giflib: for gif format support'
-             'libpulse: for advanced sound support'
-             'gtk2: for the Gtk+ look and feel - desktop usage')
-  install=jre7-openjdk.install
-  conflicts=('openjdk6')
-  
-  mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
-  # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
-  for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
-  done
-  popd
-  
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
-  # Install icons and menu entries
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
-    install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-                  ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
-  done
-  
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-}
-
-package_jdk7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
-  depends=('jre7-openjdk')
-  provides=('java-environment=7')
-  conflicts=('java-environment')
-  #  replaces=('openjdk6')
-  backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
-
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-
-  # Main files
-  install -m755 -d ${pkgdir}/${_jvmdir}/
-
-  cp -a demo include lib sample ${pkgdir}/${_jvmdir}
-
-  # 'bin' files
-  pushd bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
-                   ${pkgdir}/usr/bin/ \
-                   ${pkgdir}/usr/share/man/{,ja/}man1/
-
-  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
-  for b in $(ls | grep -v java-rmi.cgi); do
-    if [ -e ../jre/bin/${b} ]; then
-      # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
-    else
-      # Copy binary to jdk/bin/
-      install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
-      # Copy man page
-      install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
-      install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
-      # Link from /bin/
-      ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
-    fi
-  done
-  popd
-
-  # Handling 'java-rmi.cgi' separately
-  install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
-
-  # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
-  install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
-}
-
-package_openjdk7-src() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
-  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
-             ${pkgdir}/${_jvmdir}/src.zip
-}
diff --git a/staging/java7-openjdk/fix_corba_cmds_path.diff b/staging/java7-openjdk/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/staging/java7-openjdk/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/staging/java7-openjdk/fontconfig-paths.diff b/staging/java7-openjdk/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/staging/java7-openjdk/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/staging/java7-openjdk/glibc2_15.diff b/staging/java7-openjdk/glibc2_15.diff
deleted file mode 100644
index c2fd6124b..000000000
--- a/staging/java7-openjdk/glibc2_15.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -33,8 +33,6 @@
- #include "opto/subnode.hpp"
- 
- // Portions of code courtesy of Clifford Click
--
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
- 
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@ extern "C" {                            
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread 
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM 
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@ extern "C" {                            
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@ extern "C" {                            
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
-
diff --git a/staging/java7-openjdk/jdk7-openjdk.profile b/staging/java7-openjdk/jdk7-openjdk.profile
deleted file mode 100644
index 91265cc86..000000000
--- a/staging/java7-openjdk/jdk7-openjdk.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/staging/java7-openjdk/jdk7-openjdk.profile.csh b/staging/java7-openjdk/jdk7-openjdk.profile.csh
deleted file mode 100644
index cc7dc8ab1..000000000
--- a/staging/java7-openjdk/jdk7-openjdk.profile.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
diff --git a/staging/java7-openjdk/jre7-openjdk-headless.install b/staging/java7-openjdk/jre7-openjdk-headless.install
deleted file mode 100644
index 45f52fe32..000000000
--- a/staging/java7-openjdk/jre7-openjdk-headless.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-}
-
-post_upgrade() {
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-}
-
-#post_remove() {
-#
-#}
diff --git a/staging/java7-openjdk/jre7-openjdk.install b/staging/java7-openjdk/jre7-openjdk.install
deleted file mode 100644
index d98e79ec5..000000000
--- a/staging/java7-openjdk/jre7-openjdk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/jre.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/staging/java7-openjdk/jre7-openjdk.profile b/staging/java7-openjdk/jre7-openjdk.profile
deleted file mode 100644
index c86ce857a..000000000
--- a/staging/java7-openjdk/jre7-openjdk.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
-export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/staging/java7-openjdk/jre7-openjdk.profile.csh b/staging/java7-openjdk/jre7-openjdk.profile.csh
deleted file mode 100644
index a9aed27d1..000000000
--- a/staging/java7-openjdk/jre7-openjdk.profile.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/staging/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/staging/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
deleted file mode 100644
index c68bd4441..000000000
--- a/staging/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-08-06 15:59:26.000000000 +0200
-@@ -91,10 +91,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -141,7 +141,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
diff --git a/staging/java7-openjdk/openjdk7_nonreparenting-wm.diff b/staging/java7-openjdk/openjdk7_nonreparenting-wm.diff
deleted file mode 100644
index ba1a588e1..000000000
--- a/staging/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2011-08-07 18:45:54.000000000 +0200
-@@ -102,7 +102,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -576,7 +577,7 @@
-     // TODO: according to wikipedia, compiz is now reparenting. This should
-     // probably be updated.
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -762,9 +763,17 @@
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -775,6 +784,8 @@
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1289,6 +1300,7 @@
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index a1b5b44c1..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 147708 2012-01-27 10:22:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# 	not detected by namcap because libgl depends on it
-#	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
-         'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
-          'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
-           'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'e4198a443703f749b58a4fec88362fced1b45789'
-          '264e395c2c44cdda5a242c6dee649afab44cd6e5'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
-	cd "${srcdir}"/${_pkgname}-${pkgver}
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-	patch -p0 -i "${srcdir}"/fixpath.patch
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${_pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_Xmms=OFF \
-        -DWITH_Googlegadgets=OFF \
-        -DWITH_libgps=OFF \
-        -DWITH_OpenGLES=ON \
-        -DKWIN_BUILD_WITH_OPENGLES=ON \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
-	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
-	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
-	install -d -m755 "${pkgdir}"/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
-	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
-
-	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
-}
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index dfedb8edf..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		required	pam_nologin.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 9ec074d06..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/staging/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+"  if [ -x \"$i\" ]; then\n"
-+"    . \"$i\"\n"
-+"  fi\n"
-+"  done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- "  for i in /etc/X11/Xresources/*; do\n"
- "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 0ee312673..000000000
--- a/staging/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147710 2012-01-27 10:23:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.8.0
-pkgrel=2
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 617716c8a..000000000
--- a/staging/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147712 2012-01-27 10:35:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index 36452a1cb..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 147665 2012-01-26 07:10:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
-        'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch')
-sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       # https://bugs.kde.org/show_bug.cgi?id=285028
-       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/staging/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/staging/kdelibs/fix-knotify-filepath.patch b/staging/kdelibs/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/staging/kdelibs/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/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/staging/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch
deleted file mode 100644
index bdcd39a6c..000000000
--- a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 5 Jan 2012 10:06:05 +0100
-Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
-
----
- cmake/modules/FindXine.cmake |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 37c58c6..d71969a 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
-   ${PC_LIBXINE_LIBRARY_DIRS}
-  )
- 
--find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
-+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
-    HINTS
-    ${PC_LIBXINE_PREFIX}/bin
- )
- 
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
--   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
-       set(XINE_VERSION_OK TRUE)
-       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
--- 
-1.7.8.2
-
diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdelibs3/PKGBUILD b/staging/kdelibs3/PKGBUILD
deleted file mode 100644
index e59d262b1..000000000
--- a/staging/kdelibs3/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 146921 2012-01-19 08:17:01Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kdelibs3
-pkgver=3.5.10
-pkgrel=12
-pkgdesc='KDE3 Core Libraries'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
-         'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
-optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool')
-install=kdelibs3.install
-source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
-        'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
-        'acinclude.patch'
-        'kde3.profile'
-        'kde4-compatibility.patch'
-        'kconf_updaterc'
-        'openssl.patch'
-        'kdelibs3-missing-include.patch')
-sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
-          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
-          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
-          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
-          '35e56fe4c5f71685e64b13f448dcacc620166e06'
-          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
-          'e5f5b8c060a2db9cedb82bf18caadfa869921779')
-
-build() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	. /etc/profile.d/qt3.sh
-	. "$srcdir"/kde3.profile
-
-	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
-	patch -p1 -i "$srcdir"/acinclude.patch
-	patch -p1 -i "$srcdir"/kde4-compatibility.patch
-	patch -p1 -i "${srcdir}"/openssl.patch
-	patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
-
-	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-	make -f admin/Makefile.common cvs
-
-	./configure --prefix=/opt/kde \
-		--with-distribution='Arch Linux' \
-		--with-alsa \
-		--disable-debug \
-		--disable-dnssd \
-		--disable-dnotify \
-		--enable-inotify \
-		--enable-sendfile \
-		--without-lua \
-		--with-hspell \
-		--enable-gcc-hidden-visibility \
-		--enable-final \
-		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
-		--without-arts \
-		--disable-libfam
-	make
-}
-
-package() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	make DESTDIR="$pkgdir" install
-
-	# disable broken kconf_update by default
-	install -D -m644 "$srcdir"/kconf_updaterc \
-      "$pkgdir"/opt/kde/share/config/kconf_updaterc
-
-	# install KDE3 profile
-	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
-	# make KDE3 styles available to Qt3
-	install -d -m755 "$pkgdir"/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
-
-	# cert bundle seems to be hardcoded
-	# link it to the one from ca-certificates
-	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-
-	# we don't have khelpcenter anyway
-	rm -rf "$pkgdir"/opt/kde/share/doc
-
-	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
-}
diff --git a/staging/kdelibs3/acinclude.patch b/staging/kdelibs3/acinclude.patch
deleted file mode 100644
index 0610d6df5..000000000
--- a/staging/kdelibs3/acinclude.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-2009-12-10  Stepan Kasal  <skasal@redhat.com>
-
-The change of implementation of AC_REQUIRE in 2.64 caused a regression
-in the arts project.
-This can be fixed by shuffling some macro calls.
-
-I suppose that most of this patch will not be needed with a future
-release of Autoconf.
-But the last chunk of this patch is a real bug in this source and
-should go upstream.
-
---- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
-+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
-@@ -3081,8 +3081,18 @@
- fi
- ])
- 
-+AC_DEFUN([AC_CHECK_COMPILERS_CC],
-+[ 
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+  AC_PROG_CC
-+  CXXFLAGS=" $CXXFLAGS"
-+  AC_PROG_CXX
-+])
-+
- AC_DEFUN([AC_CHECK_COMPILERS],
- [
-+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
-   AC_ARG_ENABLE(debug,
- 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-   [
-@@ -3141,11 +3151,6 @@
-     [kde_use_profiling="no"]
-   )
- 
--  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
--  CFLAGS=" $CFLAGS"
--
--  AC_PROG_CC 
--
-   AC_PROG_CPP
- 
-   if test "$GCC" = "yes"; then
-@@ -3174,10 +3179,6 @@
-      LDFLAGS=""
-   fi
- 
--  CXXFLAGS=" $CXXFLAGS"
--
--  AC_PROG_CXX
--
-   KDE_CHECK_FOR_BAD_COMPILER
- 
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-@@ -3503,8 +3504,8 @@
- AC_REQUIRE([AC_LIBTOOL_DLOPEN])
- AC_REQUIRE([KDE_CHECK_LIB64])
- 
--AC_OBJEXT
--AC_EXEEXT
-+AC_REQUIRE([AC_OBJEXT])
-+AC_REQUIRE([AC_EXEEXT])
- 
- AM_PROG_LIBTOOL
- AC_LIBTOOL_CXX
diff --git a/staging/kdelibs3/kconf_updaterc b/staging/kdelibs3/kconf_updaterc
deleted file mode 100644
index 24c2623fb..000000000
--- a/staging/kdelibs3/kconf_updaterc
+++ /dev/null
@@ -1,2 +0,0 @@
-updateInfoAdded=false
-autoUpdateDisabled=true
diff --git a/staging/kdelibs3/kde3.profile b/staging/kdelibs3/kde3.profile
deleted file mode 100755
index ef09631ff..000000000
--- a/staging/kdelibs3/kde3.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
-  export XDG_DATA_DIRS=/opt/kde/share
-fi
diff --git a/staging/kdelibs3/kde4-compatibility.patch b/staging/kdelibs3/kde4-compatibility.patch
deleted file mode 100644
index 129c314ae..000000000
--- a/staging/kdelibs3/kde4-compatibility.patch
+++ /dev/null
@@ -1,1012 +0,0 @@
-diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp
---- kdelibs-3.5.10/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
-+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp	2009-08-06 06:18:06.000000000 +0200
-@@ -158,7 +158,7 @@
-           int i = 0;
- 
-           // argument 0 has to be drkonqi
--          argv[i++] = "drkonqi";
-+          argv[i++] = "/usr/lib/kde4/libexec/drkonqi";
- 
- #if defined Q_WS_X11
-           // start up on the correct display
-@@ -325,7 +325,7 @@
-       _exit(253);
-     if(!geteuid() && setuid(getuid()) < 0)
-       _exit(253);
--    execvp("drkonqi", const_cast< char** >( argv ));
-+    execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv ));
-     _exit(errno);
-   }
-   else
-diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am
---- kdelibs-3.5.10/kded/Makefile.am	2005-10-10 17:06:29.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.am	2009-08-06 06:21:37.000000000 +0200
-@@ -58,7 +58,7 @@
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
- 
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- 
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
-diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in
---- kdelibs-3.5.10/kded/Makefile.in	2008-08-20 18:05:57.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.in	2009-08-06 06:22:19.000000000 +0200
-@@ -535,7 +535,7 @@
- 
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
- #>- all: all-am
-@@ -1173,7 +1173,7 @@
- 	-rm -f  kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc
- 
- #>+ 2
--KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
-+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
- 
- #>+ 2
- docs-am:
-diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu
---- kdelibs-3.5.10/kded/applications.menu	2005-09-10 10:27:40.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,469 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Applications</Name>
--	<Directory>kde-main.directory</Directory>
--	<!-- Search the default locations -->
--	<KDELegacyDirs/>
--	<DefaultAppDirs/>
--	<DefaultDirectoryDirs/>
--	<DefaultLayout>
--		<Merge type="menus"/>
--		<Merge type="files"/>
--		<Separator/>
--		<Menuname>More</Menuname>
--	</DefaultLayout>
--	<Layout>
--		<Merge type="menus"/>
--		<Menuname>Applications</Menuname>
--		<Merge type="files"/>
--	</Layout>
--
--	<Menu>
--		<Name>Applications</Name>
--		<Directory>kde-unknown.directory</Directory>
--		<OnlyUnallocated/>
--		<Include>
--			<Not>
--				<!-- Don't list non-KDE core applications -->
--				<And>
--					<Category>Core</Category>
--					<Not><Category>KDE</Category></Not>
--				</And>
--				<!-- Don't list SUSE's YaST in here -->
--				<Category>X-SuSE-YaST</Category>
--			</Not>
--		</Include>
--	</Menu>
--       <Menu>
--                <Name>Development</Name>
--                <Directory>kde-development.directory</Directory>
--                <Menu>
--                        <Name>X-KDE-KDevelopIDE</Name>
--                        <Directory>kde-development-kdevelop.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Development</Category>
--                                <Category>X-KDE-KDevelopIDE</Category>
--                                </And>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>Translation</Name>
--			<Directory>kde-development-translation.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>Translation</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Web Development</Name>
--			<Directory>kde-development-webdevelopment.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>WebDevelopment</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Include>
--                        <And>
--                        <Category>Development</Category>
--                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
--                        <Not><Category>Translation</Category></Not>
--                        <Not><Category>WebDevelopment</Category></Not>
--                        </And>
--                </Include>
--        </Menu>
--	<Menu>
--		<Name>Science</Name>
--		<Directory>kde-science.directory</Directory>
--		<Include>
--			<And><!-- Include /any/ Science app which is not an Education app -->
--				<Or>
--					<Category>Astronomy</Category>
--					<Category>Biology</Category>
--					<Category>Chemistry</Category>
--					<Category>Geology</Category>
--					<Category>MedicalSoftware</Category>
--					<Category>Physics</Category>
--					<Category>Math</Category>
--					<Category>Science</Category>
--				</Or>
--				<Not><Category>Education</Category></Not>
--			</And>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Edutainment</Name>
--		<Directory>kde-edutainment.directory</Directory>
--		<Menu>
--			<Name>Languages</Name>
--			<Directory>kde-edu-languages.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Mathematics</Name>
--			<Directory>kde-edu-mathematics.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Math</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Miscellaneous</Name>
--			<Directory>kde-edu-miscellaneous.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Not>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				<Category>Math</Category>
--				<Category>Science</Category>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Not>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Science</Name>
--			<Directory>kde-edu-science.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Science</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Tools</Name>
--			<Directory>kde-edu-tools.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Games</Name>
--		<Directory>kde-games.directory</Directory>
--		<Menu>
--			<Name>Arcade</Name>
--			<Directory>kde-games-arcade.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>ArcadeGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Board</Name>
--			<Directory>kde-games-board.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>BoardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Card</Name>
--			<Directory>kde-games-card.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>CardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Kidsgames</Name>
--			<Directory>kde-games-kids.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Or>
--				<Category>X-KDE-KidsGame</Category>
--				<Category>KidsGame</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>TacticStrategy</Name>
--			<Directory>kde-games-strategy.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>StrategyGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Include>
--			<And>
--			<Category>Game</Category>
--			<Not>
--			<Category>ArcadeGame</Category>
--			<Category>BoardGame</Category>
--			<Category>CardGame</Category>
--			<Category>X-KDE-KidsGame</Category>
--			<Category>KidsGame</Category>
--			<Category>StrategyGame</Category>
--			</Not>
--			</And>
--		</Include>
--               <Menu>
--                        <Name>Toys</Name>
--                        <Directory>kde-toys.directory</Directory>
--                        <Include>
--                                 <Category>Amusement</Category>
--                        </Include>
--               </Menu>
--	</Menu>
--	<Menu>
--		<Name>Graphics</Name>
--		<Directory>kde-graphics.directory</Directory>
--		<Include>
--			<And>
--			<Category>Graphics</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Graphics</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Internet</Name>
--		<Directory>kde-internet.directory</Directory>
--		<Include>
--			<And>
--			<Category>Network</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--		  <Name>Terminal</Name>
--		  <Directory>kde-internet-terminal.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Network</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Multimedia</Name>
--		<Directory>kde-multimedia.directory</Directory>
--		<Include>
--			<And>
--			<Category>AudioVideo</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>AudioVideo</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Office</Name>
--		<Directory>kde-office.directory</Directory>
--		<Layout>
--			<Merge type="menus"/>
--			<Filename>kde-koshell.desktop</Filename>
--			<Filename>kde-Kontact.desktop</Filename>
--			<Separator/>
--			<Filename>kde-kword.desktop</Filename>
--			<Filename>kde-kspread.desktop</Filename>
--			<Filename>kde-kpresenter.desktop</Filename>
--			<Merge type="files"/>
--			<Separator/>
--			<Menuname>More</Menuname>
--		</Layout>
--		<Include>
--                        <And>
--			<Category>Office</Category>
--                        <Not><Category>X-KDE-More</Category></Not>
--                        </And>
--                </Include>
--                <Menu>
--                        <Name>More</Name>
--                        <Directory>kde-more.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Office</Category>
--                                <Category>X-KDE-More</Category>
--                                </And>
--                        </Include>
--                </Menu>
--	</Menu>
--	<Menu>
--		<Name>Settingsmenu</Name>
--		<Directory>kde-settingsmenu.directory</Directory>
--		<Include>
--			<Category>Settings</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>System</Name>
--		<Directory>kde-system.directory</Directory>
--		<Include>
--			<And>
--			<Category>System</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>System</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>Terminal</Name>
--			<Directory>kde-system-terminal.directory</Directory>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Utilities</Name>
--		<Directory>kde-utilities.directory</Directory>
--		<Include>
--			<And>
--			<Category>Utility</Category>
--			<Not><Category>Accessibility</Category></Not>
--			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
--			<Not><Category>X-KDE-Utilities-File</Category></Not>
--			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
--			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>Accessibility</Name>
--			<Directory>kde-utilities-accessibility.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>Accessibility</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Desktop</Name>
--			<Directory>kde-utilities-desktop.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Desktop</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Menu>
--                        <Name>Editors</Name>
--                        <Directory>kde-editors.directory</Directory>
--                        <Include>
--                                <Category>TextEditor</Category>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>File</Name>
--			<Directory>kde-utilities-file.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-File</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Peripherals</Name>
--			<Directory>kde-utilities-peripherals.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Peripherals</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>PIM</Name>
--			<Directory>kde-utilities-pim.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-PIM</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>XUtilities</Name>
--			<Directory>kde-utilities-xutils.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Include>
--		<And>
--		<Category>KDE</Category>
--		<Category>Core</Category>
--		</And>
--	</Include>
--	<DefaultMergeDirs/>
--	<MergeFile>applications-kmenuedit.menu</MergeFile>
--</Menu>
-diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.10/kded/kbuildsycoca.cpp	2007-05-14 09:52:43.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp	2009-08-06 06:23:48.000000000 +0200
-@@ -379,7 +379,7 @@
-      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
-              this, SLOT(slotCreateEntry(const QString &, KService **)));
-              
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu
---- kdelibs-3.5.10/kded/kde-applications.menu	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-3.5.10.new/kded/kde-applications.menu	2005-09-10 10:27:40.000000000 +0200
-@@ -0,0 +1,469 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Applications</Name>
-+	<Directory>kde-main.directory</Directory>
-+	<!-- Search the default locations -->
-+	<KDELegacyDirs/>
-+	<DefaultAppDirs/>
-+	<DefaultDirectoryDirs/>
-+	<DefaultLayout>
-+		<Merge type="menus"/>
-+		<Merge type="files"/>
-+		<Separator/>
-+		<Menuname>More</Menuname>
-+	</DefaultLayout>
-+	<Layout>
-+		<Merge type="menus"/>
-+		<Menuname>Applications</Menuname>
-+		<Merge type="files"/>
-+	</Layout>
-+
-+	<Menu>
-+		<Name>Applications</Name>
-+		<Directory>kde-unknown.directory</Directory>
-+		<OnlyUnallocated/>
-+		<Include>
-+			<Not>
-+				<!-- Don't list non-KDE core applications -->
-+				<And>
-+					<Category>Core</Category>
-+					<Not><Category>KDE</Category></Not>
-+				</And>
-+				<!-- Don't list SUSE's YaST in here -->
-+				<Category>X-SuSE-YaST</Category>
-+			</Not>
-+		</Include>
-+	</Menu>
-+       <Menu>
-+                <Name>Development</Name>
-+                <Directory>kde-development.directory</Directory>
-+                <Menu>
-+                        <Name>X-KDE-KDevelopIDE</Name>
-+                        <Directory>kde-development-kdevelop.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Development</Category>
-+                                <Category>X-KDE-KDevelopIDE</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>Translation</Name>
-+			<Directory>kde-development-translation.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>Translation</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Web Development</Name>
-+			<Directory>kde-development-webdevelopment.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>WebDevelopment</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Include>
-+                        <And>
-+                        <Category>Development</Category>
-+                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-+                        <Not><Category>Translation</Category></Not>
-+                        <Not><Category>WebDevelopment</Category></Not>
-+                        </And>
-+                </Include>
-+        </Menu>
-+	<Menu>
-+		<Name>Science</Name>
-+		<Directory>kde-science.directory</Directory>
-+		<Include>
-+			<And><!-- Include /any/ Science app which is not an Education app -->
-+				<Or>
-+					<Category>Astronomy</Category>
-+					<Category>Biology</Category>
-+					<Category>Chemistry</Category>
-+					<Category>Geology</Category>
-+					<Category>MedicalSoftware</Category>
-+					<Category>Physics</Category>
-+					<Category>Math</Category>
-+					<Category>Science</Category>
-+				</Or>
-+				<Not><Category>Education</Category></Not>
-+			</And>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Edutainment</Name>
-+		<Directory>kde-edutainment.directory</Directory>
-+		<Menu>
-+			<Name>Languages</Name>
-+			<Directory>kde-edu-languages.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Mathematics</Name>
-+			<Directory>kde-edu-mathematics.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Math</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Miscellaneous</Name>
-+			<Directory>kde-edu-miscellaneous.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Not>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				<Category>Math</Category>
-+				<Category>Science</Category>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Not>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Science</Name>
-+			<Directory>kde-edu-science.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Science</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Tools</Name>
-+			<Directory>kde-edu-tools.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Games</Name>
-+		<Directory>kde-games.directory</Directory>
-+		<Menu>
-+			<Name>Arcade</Name>
-+			<Directory>kde-games-arcade.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>ArcadeGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Board</Name>
-+			<Directory>kde-games-board.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>BoardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Card</Name>
-+			<Directory>kde-games-card.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>CardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Kidsgames</Name>
-+			<Directory>kde-games-kids.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Or>
-+				<Category>X-KDE-KidsGame</Category>
-+				<Category>KidsGame</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>TacticStrategy</Name>
-+			<Directory>kde-games-strategy.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>StrategyGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Include>
-+			<And>
-+			<Category>Game</Category>
-+			<Not>
-+			<Category>ArcadeGame</Category>
-+			<Category>BoardGame</Category>
-+			<Category>CardGame</Category>
-+			<Category>X-KDE-KidsGame</Category>
-+			<Category>KidsGame</Category>
-+			<Category>StrategyGame</Category>
-+			</Not>
-+			</And>
-+		</Include>
-+               <Menu>
-+                        <Name>Toys</Name>
-+                        <Directory>kde-toys.directory</Directory>
-+                        <Include>
-+                                 <Category>Amusement</Category>
-+                        </Include>
-+               </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Graphics</Name>
-+		<Directory>kde-graphics.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Graphics</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Graphics</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Internet</Name>
-+		<Directory>kde-internet.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Network</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+		  <Name>Terminal</Name>
-+		  <Directory>kde-internet-terminal.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Network</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Multimedia</Name>
-+		<Directory>kde-multimedia.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>AudioVideo</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>AudioVideo</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Office</Name>
-+		<Directory>kde-office.directory</Directory>
-+		<Layout>
-+			<Merge type="menus"/>
-+			<Filename>kde-koshell.desktop</Filename>
-+			<Filename>kde-Kontact.desktop</Filename>
-+			<Separator/>
-+			<Filename>kde-kword.desktop</Filename>
-+			<Filename>kde-kspread.desktop</Filename>
-+			<Filename>kde-kpresenter.desktop</Filename>
-+			<Merge type="files"/>
-+			<Separator/>
-+			<Menuname>More</Menuname>
-+		</Layout>
-+		<Include>
-+                        <And>
-+			<Category>Office</Category>
-+                        <Not><Category>X-KDE-More</Category></Not>
-+                        </And>
-+                </Include>
-+                <Menu>
-+                        <Name>More</Name>
-+                        <Directory>kde-more.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Office</Category>
-+                                <Category>X-KDE-More</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Settingsmenu</Name>
-+		<Directory>kde-settingsmenu.directory</Directory>
-+		<Include>
-+			<Category>Settings</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>System</Name>
-+		<Directory>kde-system.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>System</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>System</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>ScreenSavers</Name>
-+			<Directory>kde-system-screensavers.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>Terminal</Name>
-+			<Directory>kde-system-terminal.directory</Directory>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Utilities</Name>
-+		<Directory>kde-utilities.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Utility</Category>
-+			<Not><Category>Accessibility</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-+			<Not><Category>X-KDE-Utilities-File</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-+			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>Accessibility</Name>
-+			<Directory>kde-utilities-accessibility.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>Accessibility</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Desktop</Name>
-+			<Directory>kde-utilities-desktop.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Desktop</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Menu>
-+                        <Name>Editors</Name>
-+                        <Directory>kde-editors.directory</Directory>
-+                        <Include>
-+                                <Category>TextEditor</Category>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>File</Name>
-+			<Directory>kde-utilities-file.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-File</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Peripherals</Name>
-+			<Directory>kde-utilities-peripherals.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Peripherals</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>PIM</Name>
-+			<Directory>kde-utilities-pim.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-PIM</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>XUtilities</Name>
-+			<Directory>kde-utilities-xutils.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Include>
-+		<And>
-+		<Category>KDE</Category>
-+		<Category>Core</Category>
-+		</And>
-+	</Include>
-+	<DefaultMergeDirs/>
-+	<MergeFile>applications-kmenuedit.menu</MergeFile>
-+</Menu>
diff --git a/staging/kdelibs3/kdelibs3-missing-include.patch b/staging/kdelibs3/kdelibs3-missing-include.patch
deleted file mode 100644
index 5b84ef746..000000000
--- a/staging/kdelibs3/kdelibs3-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeprint/cups/cupsdconf2/cups-util.c.old	2012-01-19 01:30:26.000000000 -0500
-+++ kdeprint/cups/cupsdconf2/cups-util.c	2012-01-19 01:31:33.000000000 -0500
-@@ -2,6 +2,7 @@
- #include <cups/http.h>
- #include <cups/cups.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/staging/kdelibs3/kdelibs3.install b/staging/kdelibs3/kdelibs3.install
deleted file mode 100644
index 7291ac0a2..000000000
--- a/staging/kdelibs3/kdelibs3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
diff --git a/staging/kdelibs3/openssl.patch b/staging/kdelibs3/openssl.patch
deleted file mode 100644
index a948b884a..000000000
--- a/staging/kdelibs3/openssl.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 
diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD
deleted file mode 100644
index 3206bc566..000000000
--- a/staging/koffice/PKGBUILD
+++ /dev/null
@@ -1,306 +0,0 @@
-# $Id: PKGBUILD 147690 2012-01-27 04:08:22Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-pkgbase=koffice
-pkgname=(
-	'koffice-filters'
-	'koffice-interfaces'
-	'koffice-libs'
-	'koffice-plugins'
-	'koffice-pics'
-	'koffice-servicetypes'
-	'koffice-templates'
-	'koffice-tools'
-	'koffice-karbon'
-	'koffice-karbon-doc'
-#	'koffice-kchart'
-#	'koffice-kchart-doc'
-	'koffice-kexi'
-	'koffice-kexi-doc'
-	'koffice-kformula'
-	'koffice-kformula-doc'
-	'koffice-kounavail'
-	'koffice-kplato'
-#	'koffice-kplato-doc'
-	'koffice-kpresenter'
-	'koffice-kpresenter-doc'
-	'koffice-krita'
-#	'koffice-krita-doc' # no krita-doc anymore upstream
-	'koffice-kspread'
-	'koffice-kspread-doc'
-	'koffice-kword'
-#	'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources)
-	'koffice-handbook'
-	'koffice-thesaurus-doc'
-#	'koffice-kdgantt' # still an empty package
-)
-pkgver=2.3.3
-pkgrel=12
-arch=('i686' 'x86_64')
-url='http://koffice.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
-             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf')
-groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch')
-sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
-            'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa')
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
-	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-	patch -p1 -i "${srcdir}"/gcc46.patch
-    patch -p1 -i "${srcdir}"/qt48fix.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-##### 1st package common files, depends, optdepends of the koffice applications #####
-
-package_koffice-filters(){
-	pkgdesc="Filters for the KDE office suite"
-	depends=('shared-mime-info' 'libgsf')
-	optdepends=('libwpd: WordPerfect document importer'
-                   'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-                   'libkdcraw: support for raw images' 'poppler: support for pdf' 
-		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
-		   'koffice-kplato: Kplato filters')
-	install=filters.install
-        cd "${srcdir}/build/filters"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-interfaces(){
-	pkgdesc="Interfaces for the KDE office suite"
-	depends=('koffice-libs')
-	cd "${srcdir}/build/interfaces"
-	make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-libs(){
-	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'lcms' 'koffice-servicetypes')
-        cd "${srcdir}/build/libs"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-plugins(){
-	pkgdesc="Plugins for the KDE office suite"
-	depends=('koffice-libs')
-	replaces=('koffice-kchart')
-	conflicts=('koffice-kchart')
-        cd "${srcdir}/build/plugins"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-pics(){
-	pkgdesc="Icons for the KDE office suite"
-	depends=('desktop-file-utils' 'xdg-utils')
-	install=koffice.install
-        cd "${srcdir}/build/pics"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-servicetypes(){
-	pkgdesc="Servicetypes for the KDE office suite"
-        cd "${srcdir}/build/servicetypes"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-templates(){
-	pkgdesc="Templates for the KDE office suite"
-        cd "${srcdir}/build/templates"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-tools(){
-	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs' 'oxygen-icons')
-        cd "${srcdir}/build/tools"
-        make DESTDIR="${pkgdir}" install
-}
-
-#### package common files done #####
-
-#### package apps and their docs #####
-
-package_koffice-karbon(){
-	pkgdesc="Vector drawing application for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-karbon-doc(){
-	pkgdesc="Documentation for karbon"
-        cd "${srcdir}/build/doc/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi(){
-        pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('koffice-kspread' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi-doc(){
-        pkgdesc="Documentation for kexi"
-        cd "${srcdir}/build/doc/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula(){
-        pkgdesc="Formula editor for the KDE office suite"
-	depends=('koffice-libs')
-	install=koffice.install
-        cd "${srcdir}/build/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula-doc() {
-	pkgdesc="Documentation for koffice-kformula"
-	cd "${srcdir}/build/doc/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-
-package_koffice-kounavail(){
-	pkgdesc="Kounavail for the KDE office suite"
-	depends=('koffice-libs')
-        cd "${srcdir}/build/kounavail"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kplato(){
-	pkgdesc="Project management application for KDE"
-	depends=('koffice-kword' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kplato"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-kplato-doc(){
-#	pkgdesc="Documentation for kplato"
-#        cd ${srcdir}/build/doc/kplato
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-kpresenter(){
-	pkgdesc="Presentation tool for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kpresenter-doc(){
-	pkgdesc="Documentation for kpresenter"
-        cd "${srcdir}/build/doc/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-krita(){
-	pkgdesc="Graphics editor for KDE"
-	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
-		 'koffice-plugins' 'poppler-qt' 'opengtl')
-        optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
-	install=krita.install
-        cd "${srcdir}/build/krita"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-krita-doc(){
-#	pkgdesc="Documentation for krita"
-#        cd ${srcdir}/build/doc/krita
-#        make DESTDIR="${pkgdir}" install
-#}
-
-
-package_koffice-kspread(){
-	pkgdesc="Spreadsheet application for KDE"
-	depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
-	optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kspread-doc(){
-	pkgdesc="Documentation for kspread"
-	cd "${srcdir}/build/doc/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kword(){
-	pkgdesc="Wordprocessor for KDE"
-	depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
-		'koffice-kounavail' 'koffice-plugins')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kword"
-        make DESTDIR="${pkgdir}" install
-
-        # some sed lines to have python2 in extension scripts
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py"
-}
-
-#package_koffice-kword-doc(){
-#	pkgdesc="Documentation for kword"
-#        cd ${srcdir}/build/doc/kword
-#        make DESTDIR="${pkgdir}" install
-#}
-
-##### package apps done #####
-
-#package_koffice-kchart(){
-#	pkgdesc="Charting tool for KDE"
-#	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates')
-#        optdepends=('koffice-filters: import/export filters')
-#	install=koffice.install
-#        cd "${srcdir}/build/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kchart-doc(){
-#	pkgdesc="Documentation for kchart"
-#        cd "${srcdir}/build/doc/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kdgantt(){
-#	pkgdesc="Gantt for KDE"
-#        cd "${srcdir}/build/kdgantt"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-handbook() {
-	pkgdesc="Documentation for koffice"
-	cd "${srcdir}/build/doc/koffice"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-thesaurus-doc(){
-	pkgdesc="Documentation for koffice-thesaurus"
-	cd "${srcdir}/build/doc/thesaurus"
-        make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/koffice/filters.install b/staging/koffice/filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/koffice/filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch
deleted file mode 100644
index dcf8a4f85..000000000
--- a/staging/koffice/gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
-+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
-@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
-         return IT_FLOAT16;
-     case Imf::FLOAT:
-         return IT_FLOAT32;
-+    default:
-+    // shouldn't reach here
-+        return IT_UNSUPPORTED;
-     }
- }
- 
-@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
-     case IT_UNKNOWN:
-     case IT_UNSUPPORTED:
-         return 0;
-+    default:
-+    // shouldn't reach here
-+        return 0;
-     }
- }
- 
diff --git a/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch
deleted file mode 100644
index e2a55a216..000000000
--- a/staging/koffice/kde4-koffice-libwpg02.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
-@@ -1,16 +1,11 @@
- 
--
- include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
- 
--set(wpgimport_PART_SRCS 
--WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+set(wpgimport_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "FileOutputHandler.hxx"
--
--FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
--	mbIsTagOpened(false),
--	mContentStream(contentStream)
--{
--}
--
--void FileOutputHandler::startDocument()
--{
--}
--
--void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << "<" << psName;
--
--	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
--	{
--		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
--	}
--	mbIsTagOpened = true;
--	msOpenedTagName = psName;
--}
--
--void FileOutputHandler::endElement(const char *psName)
--{
--	if (mbIsTagOpened)
--	{
--		if( msOpenedTagName == psName )
--		{
--			mContentStream << "/>";
--			mbIsTagOpened = false;
--		}
--		else // should not happen, but handle it
--		{
--			mContentStream << ">";
--			mContentStream << "</" << psName << ">";
--			mbIsTagOpened = false;
--		}
--	}
--	else
--	{
--		mContentStream << "</" << psName << ">";
--		mbIsTagOpened = false;
--	}
--}
--
--void FileOutputHandler::characters(const std::string &sCharacters)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << sCharacters.c_str();
--}
--
--void FileOutputHandler::endDocument()
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef FILEOUTPUTHANDLER_H
--#define FILEOUTPUTHANDLER_H
--
--#include <iostream>
--#include <sstream>
--#include <string>
--#include "GraphicsHandler.hxx"
--
--class FileOutputHandler : public GraphicsHandler
--{
--  public:
--        explicit FileOutputHandler(std::ostringstream &contentStream);
--        virtual void startDocument();
--        virtual void endDocument();
--        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
--        virtual void endElement(const char *psName);
--        virtual void characters(const std::string &sCharacters);
--
--  private:
--	bool mbIsTagOpened;
--	std::string msOpenedTagName;
--	std::ostringstream &mContentStream;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <string.h>
--
--#define ASCII_SPACE 0x0020
--
--void TagGraphicsElement::print() const
--{
--}
--
--void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->startElement(getTagName().c_str(), maAttrList);
--}
--
--void OpenTagGraphicsElement::print() const
--{ 
--	TagGraphicsElement::print(); 	
--}
--
--void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
--{
--	std::pair<std::string, std::string> tmpAttribute;
--	tmpAttribute.first = szAttributeName;
--	tmpAttribute.second = sAttributeValue;
--        maAttrList.push_back(tmpAttribute);
--}
--
--void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--
--	pHandler->endElement(getTagName().c_str());
--}
--
--void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->characters(msData);
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpd.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef _GRAPHICSELEMENT_H
--#define _GRAPHICSELEMENT_H
--#include <string>
--#include <map>
--#include <vector>
--
--#include "GraphicsHandler.hxx"
--
--class GraphicsElement
--{
--public:	
--	virtual ~GraphicsElement() {}
--	virtual void write(GraphicsHandler *pHandler) const = 0;
--	virtual void print() const {}
--};
--
--class TagGraphicsElement : public GraphicsElement
--{
--public:
--	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
--	const std::string &getTagName() const { return msTagName; }
--	virtual void print() const;
--private:
--	const std::string msTagName;
--};
--
--class OpenTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	~OpenTagGraphicsElement() {}
--	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
--	virtual void write(GraphicsHandler *pHandler) const;
--	virtual void print () const;
--private:
--	std::vector<std::pair<std::string, std::string> > maAttrList;
--};
--
--class CloseTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--};
--
--class CharDataGraphicsElement : public GraphicsElement
--{
--public:
--	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--private:
--	std::string msData;
--};
--
--
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
-- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--#ifndef _GRAPHICSHANDLER_H
--#define _GRAPHICSHANDLER_H
--#include <string>
--#include <map>
--#include <vector>
--
--class GraphicsHandler
--{
--public:
--	virtual ~GraphicsHandler() {}
--        virtual void startDocument() = 0;
--        virtual void endDocument() = 0;
--        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
--        virtual void endElement(const char *psName) = 0;
--        virtual void characters(const std::string &sCharacters) = 0;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,662 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "OdgExporter.hxx"
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <locale.h>
--
--static std::string doubleToString(const double value)
--{
--  std::ostringstream tempStream;
--  tempStream << value;
--  std::string decimalPoint(localeconv()->decimal_point);
--  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
--    return tempStream.str();
--  std::string stringValue(tempStream.str());
--  if (!stringValue.empty())
--  {
--    std::string::size_type pos;
--    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
--          stringValue.replace(pos,decimalPoint.size(),".");
--  }
--  return stringValue;
--}
--
--
--OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
--        mpHandler(pHandler),
--        m_fillRule(AlternatingFill),
--        m_gradientIndex(1),
--        m_dashIndex(1),
--        m_styleIndex(1),
--        m_width(0.0f),
--        m_height(0.0f),
--        m_isFlatXML(isFlatXML)
--{
--}
--
--OdgExporter::~OdgExporter()
--{
--        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                delete (*iterStroke);
--
--        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                delete (*iterGradient);
--
--        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                delete (*iterAutomaticStyles);
--
--        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--                delete (*bodyIter);
--}
--
--void OdgExporter::startGraphics(double width, double height)
--{
--        m_gradientIndex = 1;
--        m_dashIndex = 1;
--        m_styleIndex = 1;
--        m_width = width;
--        m_height = height;
--
--
--        mpHandler->startDocument();
--        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
--        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
--        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
--        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
--        if (m_isFlatXML)
--                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
--        tmpOfficeDocumentContent.write(mpHandler);
--
--        OpenTagGraphicsElement("office:settings").write(mpHandler);
--
--        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
--        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
--        configItemSetOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
--        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
--        configItemOpenElement1.addAttribute("config:type", "int");
--        configItemOpenElement1.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
--        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
--        configItemOpenElement2.addAttribute("config:type", "int");
--        configItemOpenElement2.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
--        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
--        configItemOpenElement3.addAttribute("config:type", "int");
--        configItemOpenElement3.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * width);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
--        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
--        configItemOpenElement4.addAttribute("config:type", "int");
--        configItemOpenElement4.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * height);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        mpHandler->endElement("config:config-item-set");
--
--        mpHandler->endElement("office:settings");
--
--}
--
--void OdgExporter::endGraphics()
--{
--        OpenTagGraphicsElement("office:styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                (*iterStroke)->write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                (*iterGradient)->write(mpHandler);
--
--        mpHandler->endElement("office:styles");
--
--        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                (*iterAutomaticStyles)->write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
--        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
--        tmpStylePageLayoutOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
--        m_value.str("");
--        m_value <<  doubleToString(m_width) << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(m_height)  << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
--        m_value.str("");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
--        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:page-layout-properties");
--
--        mpHandler->endElement("style:page-layout");
--
--        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
--        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
--        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
--        tmpStyleStyleOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
--        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
--        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
--        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:drawing-page-properties");
--
--        mpHandler->endElement("style:style");
--
--        mpHandler->endElement("office:automatic-styles");
--
--        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
--        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
--        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
--        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpStyleMasterPageOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:master-page");
--
--        mpHandler->endElement("office:master-styles");
--
--        OpenTagGraphicsElement("office:body").write(mpHandler);
--
--        OpenTagGraphicsElement("office:drawing").write(mpHandler);
--
--        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
--        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
--        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
--        tmpDrawPageOpenElement.write(mpHandler);
--
--        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--        {
--                (*bodyIter)->write(mpHandler);
--        }
--
--        mpHandler->endElement("draw:page");
--        mpHandler->endElement("office:drawing");
--        mpHandler->endElement("office:body");
--        mpHandler->endElement("office:document");
--
--        mpHandler->endDocument();
--}
--
--void OdgExporter::setPen(const libwpg::WPGPen& pen)
--{
--        m_pen = pen;
--}
--
--void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
--{
--        m_brush = brush;
--}
--
--void OdgExporter::setFillRule(FillRule rule)
--{
--        m_fillRule = rule;
--}
--
--void OdgExporter::startLayer(unsigned int)
--{
--}
--
--void OdgExporter::endLayer(unsigned int)
--{
--}
--
--void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x2-rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y2-rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rx) << "in";
--        // FIXME: what to do when rx != ry ?
--        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
--}
--
--void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.x - rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.y - ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
--}
--
--void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
--{
--        if(vertices.count() < 2)
--                return;
--
--        if(vertices.count() == 2)
--        {
--                const libwpg::WPGPoint& p1 = vertices[0];
--                const libwpg::WPGPoint& p2 = vertices[1];
--
--                writeStyle();
--                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
--                m_value.str("");
--                m_value << "gr" << m_styleIndex-1;
--                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
--                m_value.str("");
--                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
--                pDrawLineElement->addAttribute("draw:layer", "layout");
--                m_value << doubleToString(p1.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x1", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p1.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y1", m_value.str());
--                m_value.str("");
--                m_value  << doubleToString(p2.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x2", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p2.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y2", m_value.str());
--                m_value.str("");
--                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
--                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
--        }
--        else
--        {
--                // draw as path
--                libwpg::WPGPath path;
--                path.moveTo(vertices[0]);
--                for(unsigned long ii = 1; ii < vertices.count(); ii++)
--                        path.lineTo(vertices[ii]);
--                path.closed = true;
--                drawPath(path);
--        }
--}
--
--void OdgExporter::drawPath(const libwpg::WPGPath& path)
--{
--        if(path.count() == 0)
--                return;
--
--        // try to find the bounding box
--        // this is simple convex hull technique, the bounding box might not be
--        // accurate but that should be enough for this purpose
--        libwpg::WPGPoint p = path.element(0).point;
--        libwpg::WPGPoint q = path.element(0).point;
--        for(unsigned k = 0; k < path.count(); k++)
--        {
--                libwpg::WPGPathElement element = path.element(k);
--                p.x = (p.x > element.point.x) ? element.point.x : p.x;
--                p.y = (p.y > element.point.y) ? element.point.y : p.y;
--                q.x = (q.x < element.point.x) ? element.point.x : q.x;
--                q.y = (q.y < element.point.y) ? element.point.y : q.y;
--                if(element.type == libwpg::WPGPathElement::CurveToElement)
--                {
--                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
--                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
--                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
--                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
--                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
--                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
--                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
--                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
--                }
--        }
--        double vw = q.x - p.x;
--        double vh = q.y - p.y;
--
--        writeStyle();
--
--        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
--        pDrawPathElement->addAttribute("draw:layer", "layout");
--        m_value << doubleToString(p.x)  << "in";
--        pDrawPathElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(p.y)  << "in";
--        pDrawPathElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vw) << "in";
--        pDrawPathElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vh) << "in";
--        pDrawPathElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
--        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
--        m_value.str("");
--
--        for(unsigned i = 0; i < path.count(); i++)
--        {
--                libwpg::WPGPathElement element = path.element(i);
--                libwpg::WPGPoint point = element.point;
--                switch(element.type)
--                {
--                        // 2540 is 2.54*1000, 2.54 in = 1 in
--                        case libwpg::WPGPathElement::MoveToElement:
--                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::LineToElement:
--                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::CurveToElement:
--                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
--                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
--                                m_value << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        default:
--                                break;
--                }
--        }
--        if(path.closed)
--                m_value << " Z";
--        pDrawPathElement->addAttribute("svg:d", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
--}
--
--
--void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
--{
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary;
--        bitmap.generateBase64DIB(base64Binary);
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
--{
--        if (binaryData.mimeType.length() <= 0)
--                return;
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary = binaryData.getBase64Data();
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--
--static std::string colorToHex(const libwpg::WPGColor& color)
--{
--        char hexdigits[] = "0123456789abcdef";
--        char buffer[] = "123456";
--        buffer[0] = hexdigits[(color.red >> 4) & 15];
--        buffer[1] = hexdigits[color.red & 15];
--        buffer[2] = hexdigits[(color.green >> 4) & 15];
--        buffer[3] = hexdigits[color.green & 15];
--        buffer[4] = hexdigits[(color.blue >> 4) & 15];
--        buffer[5] = hexdigits[color.blue & 15];
--        return std::string(buffer);
--}
--
--void OdgExporter::writeStyle()
--{
--        m_value.str("");
--        m_name.str("");
--
--        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
--        {
--                // ODG only supports dashes with the same length of spaces inbetween
--                // here we take the first space and assume everything else the same
--                // note that dash length is written in percentage
--                double distance = m_pen.dashArray.at(1);
--                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
--                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
--                m_value << "Dash_" << m_dashIndex++;
--                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(distance*100) << "%";
--                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
--                m_value.str("");
--                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
--                {
--                        m_name << "draw:dots" << i+1;
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
--                        m_name.str("");
--                        m_name << "draw:dots" << i+1 << "-length";
--                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
--                        m_name.str("");
--                        m_value.str("");
--                }
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
--                tmpDrawGradientElement->addAttribute("draw:style", "linear");
--                m_value << "Gradient_" << m_gradientIndex++;
--                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--
--                // ODG angle unit is 0.1 degree
--                double angle = -m_brush.gradient.angle();
--                while(angle < 0)
--                        angle += 360;
--                while(angle > 360)
--                        angle -= 360;
--
--                m_value << (unsigned)(angle*10);
--                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
--                m_value.str("");
--
--                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
--                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
--                m_value << "#" << colorToHex(startColor);
--                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(stopColor);
--                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
--                m_value.str("");
--                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:border", "0%");
--                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
--                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
--        }
--
--        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
--        m_value << "gr" << m_styleIndex;
--        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
--        m_value.str("");
--        tmpStyleStyleElement->addAttribute("style:family", "graphic");
--        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
--
--        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
--
--        if(m_pen.width > 0.0)
--        {
--                m_value << doubleToString(m_pen.width) << "in";
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(m_pen.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
--                m_value.str("");
--
--                if(!m_pen.solid)
--                {
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
--                        m_value << "Dash_" << m_dashIndex-1;
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
--                        m_value.str("");
--                }
--        }
--        else
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::NoBrush)
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::Solid)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
--                m_value << "#" << colorToHex(m_brush.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
--                m_value.str("");
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
--                m_value << "Gradient_" << m_gradientIndex-1;
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
--                m_value.str("");
--        }
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
--        m_styleIndex++;
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,116 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef __ODGEXPORTER_H__
--#define __ODGEXPORTER_H__
--
--#include <iostream>
--#include <sstream>
--#include <string>
--
--#include <libwpg/libwpg.h>
--#include "GraphicsElement.hxx"
--
--class OdgExporter : public libwpg::WPGPaintInterface {
--public:
--	explicit OdgExporter(GraphicsHandler *pHandler,
--			     const bool isFlatXML = false);
--	~OdgExporter();
--
--#if LIBWPG_VERSION_MINOR<2
--	void startGraphics(double imageWidth, double imageHeight);
--	void endGraphics();
--	void startLayer(unsigned int id);
--	void endLayer(unsigned int id);
--
--	void setPen(const libwpg::WPGPen& pen);
--	void setBrush(const libwpg::WPGBrush& brush);
--	void setFillRule(FillRule rule);
--
--	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
--	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
--	void drawPolygon(const libwpg::WPGPointArray& vertices);
--	void drawPath(const libwpg::WPGPath& path);
--	void drawBitmap(const libwpg::WPGBitmap& bitmap);
--	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	libwpg::WPGPen m_pen;
--	libwpg::WPGBrush m_brush;
--	FillRule m_fillRule;
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#else
--	virtual void startGraphics(const ::WPXPropertyList &propList);
--	virtual void endGraphics();
--	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
--	virtual void startLayer(const ::WPXPropertyList &propList);
--	virtual void endLayer();
--	virtual void drawRectangle(const ::WPXPropertyList& propList);
--	virtual void drawEllipse(const ::WPXPropertyList& propList);
--	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
--	virtual void drawPath(const ::WPXPropertyListVector &path);
--	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
--	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
--	virtual void endEmbeddedGraphics();
--	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
--	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
--	virtual void endTextObject();
--	virtual void startTextLine(const ::WPXPropertyList &propList);
--	virtual void endTextLine();
--	virtual void startTextSpan(const ::WPXPropertyList &propList);
--	virtual void endTextSpan();
--	virtual void insertText(const ::WPXString &str);
--
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#endif
--};
--
--#endif // __ODGEXPORTER_H__
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
-@@ -20,28 +20,26 @@
- #include <WPGImport.h>
- #include <WPGImport.moc>
- 
--#include <QBuffer>
--#include <QByteArray>
--#include <QString>
--
--#include <kdebug.h>
- #include <KoFilterChain.h>
- #include <KoGlobal.h>
- #include <KoUnit.h>
-+#include <KoXmlWriter.h>
-+
- #include <kpluginfactory.h>
-+#include <KDebug>
- 
--#include <KoXmlWriter.h>
-+
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
- 
- #include <libwpg/libwpg.h>
- #if LIBWPG_VERSION_MINOR<2
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +54,13 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
- 
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,59 +82,31 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
--        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
-+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
- 
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
-+    delete input;
- 
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
- 
--    // we are done!
--    delete storeout;
-+    outputFile.write(output.cstr());
-+    outputFile.close();
- 
-     return KoFilter::OK;
- }
-
diff --git a/staging/koffice/koffice.install b/staging/koffice/koffice.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/koffice/koffice.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/koffice/krita.install b/staging/koffice/krita.install
deleted file mode 100644
index 5d458de55..000000000
--- a/staging/koffice/krita.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/koffice/qt48fix.patch b/staging/koffice/qt48fix.patch
deleted file mode 100644
index de72926d5..000000000
--- a/staging/koffice/qt48fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-02-17 13:10:38.000000000 +0100
-+++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
-@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
- 	<< ")";
-     return dbg;
- }
diff --git a/staging/lablgtk2/PKGBUILD b/staging/lablgtk2/PKGBUILD
deleted file mode 100644
index 64af43ec5..000000000
--- a/staging/lablgtk2/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147254 2012-01-25 04:37:32Z eric $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=lablgtk2
-pkgver=2.14.2
-pkgrel=5
-pkgdesc=" An Objective Caml interface to gtk2"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://lablgtk.forge.ocamlcore.org/"
-depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2')
-makedepends=('ocaml')
-optdepends=('ocaml: for using the tools')
-DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u')
-source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
-options=(!makeflags)
-md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
-
-build() {
-  cd "${srcdir}/lablgtk-${pkgver}"
-  ./configure --prefix=/usr
-  make world
-  make opt
-}
-
-package() {
-  cd "${srcdir}/lablgtk-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/"
-}
diff --git a/staging/lbreakout2/PKGBUILD b/staging/lbreakout2/PKGBUILD
deleted file mode 100644
index 814fc5520..000000000
--- a/staging/lbreakout2/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 146936 2012-01-19 12:08:17Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=lbreakout2
-pkgver=2.6.3
-pkgrel=3
-pkgdesc="A breakout game with nice effects, graphics, and sounds"
-arch=('i686' 'x86_64')
-url="http://lgames.sourceforge.net"
-license=('GPL')
-depends=('sdl_mixer' 'libpng')
-backup=('var/games/lbreakout2/lbreakout2.hscr')
-source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz"
-        'lbreakout2.desktop'
-	'lbreakout2.png')
-md5sums=('43900187bc935475cd6489569cd2230a'
-         '14cd34a72a8f4e3b8f385f9023625241'
-         '94e2fa393eb2a7d4494641dec580573b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-
-  ./configure --prefix=/usr \
-              --localstatedir=/var/games/lbreakout2 
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-
-  make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install
-  
-  chmod -R 755 ${pkgdir}/usr
-  chown root:games ${pkgdir}/var/games
-  chmod 775 ${pkgdir}/var/games
-  chown root:games ${pkgdir}/var/games/lbreakout2
-  chmod 755 ${pkgdir}/var/games/lbreakout2
-  chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr
-  chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr
-
-  install -Dm644 ${srcdir}/lbreakout2.png ${pkgdir}/usr/share/pixmaps/lbreakout2.png
-  install -Dm644 ${srcdir}/lbreakout2.desktop ${pkgdir}/usr/share/applications/lbreakout2.desktop
-}
diff --git a/staging/lbreakout2/lbreakout2.desktop b/staging/lbreakout2/lbreakout2.desktop
deleted file mode 100644
index c8ef945da..000000000
--- a/staging/lbreakout2/lbreakout2.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Linux Breakout 2
-Comment=Breakout and Arkanoid style arcade game
-Icon=/usr/share/pixmaps/lbreakout2.png
-TryExec=lbreakout2
-Exec=lbreakout2
-Terminal=false
-Categories=Application;Game;
diff --git a/staging/lbreakout2/lbreakout2.png b/staging/lbreakout2/lbreakout2.png
deleted file mode 100644
index f9541e184..000000000
--- a/staging/lbreakout2/lbreakout2.png
+++ /dev/null
diff --git a/staging/lcms/PKGBUILD b/staging/lcms/PKGBUILD
deleted file mode 100644
index bb67c9e75..000000000
--- a/staging/lcms/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 146955 2012-01-19 17:30:11Z eric $
-# Maintainer: Tobias Kieslich <neri@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=lcms
-pkgver=1.19
-pkgrel=2
-pkgdesc="Lightweight color management development library/engine"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('libtiff')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8af94611baf20d9646c7c2c285859818')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm 644 COPYING \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/lcms2/PKGBUILD b/staging/lcms2/PKGBUILD
deleted file mode 100644
index e3d08a500..000000000
--- a/staging/lcms2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146836 2012-01-18 20:10:04Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=lcms2
-pkgver=2.3
-pkgrel=2
-pkgdesc="Small-footprint color management engine, version 2"
-arch=('i686' 'x86_64')
-license=('MIT')
-depends=('libtiff')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/libbonoboui/PKGBUILD b/staging/libbonoboui/PKGBUILD
deleted file mode 100644
index e6c53e0ec..000000000
--- a/staging/libbonoboui/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 147198 2012-01-24 05:15:13Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libbonoboui
-pkgver=2.24.5
-pkgrel=2
-pkgdesc="User Interface library for Bonobo"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('libgnomecanvas' 'libgnome')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop"
-}
diff --git a/staging/libdmapsharing/PKGBUILD b/staging/libdmapsharing/PKGBUILD
deleted file mode 100644
index 743d5a07c..000000000
--- a/staging/libdmapsharing/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 147655 2012-01-26 01:47:40Z eric $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libdmapsharing
-pkgver=2.9.12
-pkgrel=2
-pkgdesc="A library that implements the DMAP family of protocols"
-arch=('i686' 'x86_64')
-url="http://www.flyn.org/projects/libdmapsharing/index.html"
-license=('LGPL2.1')
-depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2')
-options=('!libtool')
-source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ec34948df21e9ba0656c917b10fed1c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --with-mdns=avahi
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libetpan/PKGBUILD b/staging/libetpan/PKGBUILD
deleted file mode 100644
index e0df0b365..000000000
--- a/staging/libetpan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 145930 2012-01-04 09:16:48Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=libetpan
-pkgver=1.0
-pkgrel=4
-pkgdesc="A portable middleware for email access"
-arch=('i686' 'x86_64')
-url="http://www.etpan.org/"
-license=("custom:etpan")
-depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5addc766141a0b1d29ee1ca4ba1b6808')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/license.txt
-}
diff --git a/staging/libgdiplus/PKGBUILD b/staging/libgdiplus/PKGBUILD
deleted file mode 100644
index 26c513066..000000000
--- a/staging/libgdiplus/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146859 2012-01-18 21:23:30Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=libgdiplus
-pkgver=2.10
-pkgrel=2
-pkgdesc="An Open Source Implementation of the GDI+ API"
-arch=(i686 x86_64)
-license=('MPL' 'LGPL')
-url="http://www.mono-project.com"
-depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch)
-md5sums=('451966e8f637e3a1f02d1d30f900255d'
-         'a2d143676bbaceeb88b4c34069e93986')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 <../libpng15.patch
-  ./configure --prefix=/usr --with-cairo=system || return 1
-  
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/staging/libgdiplus/gdiplus-png14.patch b/staging/libgdiplus/gdiplus-png14.patch
deleted file mode 100644
index d13260812..000000000
--- a/staging/libgdiplus/gdiplus-png14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pngcodec.c.orig	2010-01-16 23:47:17.000000000 +0100
-+++ src/pngcodec.c	2010-01-16 23:49:49.000000000 +0100
-@@ -352,7 +352,7 @@
- 						info_ptr->palette[i].blue,
- 						info_ptr->palette[i].green,
- 						info_ptr->palette[i].red,
--						info_ptr->trans[i]); /* alpha */
-+						info_ptr->trans_alpha[i]); /* alpha */
- 			}
- 		}
- 
-@@ -418,7 +418,7 @@
- 		}
- 
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		}
- 
- 		if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
diff --git a/staging/libgdiplus/libpng15.patch b/staging/libgdiplus/libpng15.patch
deleted file mode 100644
index 31a1c0162..000000000
--- a/staging/libgdiplus/libpng15.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/pngcodec.c.orig	2010-11-03 16:52:54.000000000 +0000
-+++ src/pngcodec.c
-@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn
- 	bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
- 	bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
- #elif defined(PNG_pHYs_SUPPORTED)
--	if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
--		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
--		bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
--		bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
-+	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
-+		png_uint_32 res_x, res_y;
-+		int unit_type;
-+		png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type);
-+		if (unit_type == PNG_RESOLUTION_METER) {
-+			bitmap_data->image_flags |= ImageFlagsHasRealDPI;
-+			bitmap_data->dpi_horz = res_x * 0.0254;
-+			bitmap_data->dpi_vert = res_y * 0.0254;
-+		}
- 	}
- #endif
- 	/* default to screen resolution (if nothing was provided or available) */
-@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn
- #if defined(PNG_iCCP_SUPPORTED)
- 	{
- 		png_charp	name;
--		png_charp	profile;
-+		png_bytep	profile;
- 		png_uint_32	proflen;
- 		int		compression_type;
- 
-@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream 
- 		ImageFlags	colourspace_flag;
- 		int		i;
- 		int		j;
-+		png_colorp	png_palette;
-+		int		png_num_palette;
-+		png_bytep	trans_alpha;
-+		int		num_trans;
-+		png_color_16p	trans_color;
- 
- 		width = png_get_image_width (png_ptr, info_ptr);
- 		height = png_get_image_height (png_ptr, info_ptr);
-@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream 
- 		}
- 
- 		/* Copy palette. */
-+		png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
-+
- 		num_colours = 1 << bit_depth;
- 
- 		if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
-@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream 
- 			colourspace_flag = ImageFlagsColorSpaceRGB;
- 
- 			palette_entries = num_colours;
--			if (palette_entries > info_ptr->num_palette) {
--				palette_entries = info_ptr->num_palette;
-+			if (palette_entries > png_num_palette) {
-+				palette_entries = png_num_palette;
- 			}
- 
- 			palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
-@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream 
- 
- 			for (i=0; i < palette_entries; i++) {
- 				set_pixel_bgra (&palette->Entries[i], 0,
--						info_ptr->palette[i].blue,
--						info_ptr->palette[i].green,
--						info_ptr->palette[i].red,
-+						png_palette[i].blue,
-+						png_palette[i].green,
-+						png_palette[i].red,
- 						0xFF); /* alpha */
- 			}
- 		}
- 
-+		png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
- 		/* Make sure transparency is respected. */
--		if (info_ptr->num_trans > 0) {
-+		if (num_trans > 0) {
- 			palette->Flags |= PaletteFlagsHasAlpha;
- 			colourspace_flag |= ImageFlagsHasAlpha;
- 
--			if (info_ptr->num_trans > info_ptr->num_palette) {
--				info_ptr->num_trans = info_ptr->num_palette;
-+			if (num_trans > png_num_palette) {
-+				num_trans = png_num_palette;
- 			}
- 
--			for (i=0; i < info_ptr->num_trans; i++) {
-+			for (i=0; i < num_trans; i++) {
- 				set_pixel_bgra(&palette->Entries[i], 0,
--						info_ptr->palette[i].blue,
--						info_ptr->palette[i].green,
--						info_ptr->palette[i].red,
-+						png_palette[i].blue,
-+						png_palette[i].green,
-+						png_palette[i].red,
- #if PNG_LIBPNG_VER > 10399
--						info_ptr->trans_alpha [i]); /* alpha */
-+						trans_alpha [i]); /* alpha */
- #else
- 						info_ptr->trans[i]); /* alpha */
- #endif
-@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream 
- 		BYTE		bit_depth;
- 		int		stride;
- 		int		interlace;
-+		png_colorp	png_palette;
-+		int		png_num_palette;
- 		png_bytep *row_pointers;
- 		BYTE *rawptr;
- 		int i, j;
-@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream 
- 							png_byte palette = 0;
- 							png_byte pix = *rowp++;
- 
-+							png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
- 							palette = (pix >> 6) & 0x03;
- 							set_pixel_bgra (rawptr, 0,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 
- 							palette = (pix >> 4) & 0x03;
- 							set_pixel_bgra (rawptr, 4,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 
- 							palette = (pix >> 2) & 0x03;
- 							set_pixel_bgra (rawptr, 8,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 
- 							palette = pix & 0x03;
- 							set_pixel_bgra (rawptr, 12,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 							rawptr += 16;
- 						}
diff --git a/staging/libgnome-media-profiles/PKGBUILD b/staging/libgnome-media-profiles/PKGBUILD
deleted file mode 100644
index 7844a833a..000000000
--- a/staging/libgnome-media-profiles/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 147671 2012-01-26 09:41:28Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libgnome-media-profiles
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Library for management of audio recording profiles"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!emptydirs' '!libtool')
-install=libgnome-media-profiles.install
-source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-static -disable-scrollkeeper \
-    --disable-schemas-install
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-audio-profiles "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/libgnome-media-profiles/libgnome-media-profiles.install b/staging/libgnome-media-profiles/libgnome-media-profiles.install
deleted file mode 100644
index 22b4c8f12..000000000
--- a/staging/libgnome-media-profiles/libgnome-media-profiles.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgnome-media-profiles
-
-post_install(){
-    usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/staging/libgnomecanvas/PKGBUILD b/staging/libgnomecanvas/PKGBUILD
deleted file mode 100644
index 42ba98b4d..000000000
--- a/staging/libgnomecanvas/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147184 2012-01-24 03:06:37Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomecanvas
-pkgver=2.30.3
-pkgrel=2
-pkgdesc="The GNOME Canvas library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21')
-makedepends=('pkg-config' 'intltool')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static \
-      --enable-glade
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libgnomeui/PKGBUILD b/staging/libgnomeui/PKGBUILD
deleted file mode 100644
index 1fd98234d..000000000
--- a/staging/libgnomeui/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 147218 2012-01-24 19:35:41Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomeui
-pkgver=2.24.4
-pkgrel=2
-pkgdesc="User Interface library for GNOME"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/libgnomeui
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD
deleted file mode 100644
index 511feb174..000000000
--- a/staging/libgpod/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147659 2012-01-26 02:50:58Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.2
-pkgrel=3
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/staging/libgtkhtml/PKGBUILD b/staging/libgtkhtml/PKGBUILD
deleted file mode 100644
index 15a82f102..000000000
--- a/staging/libgtkhtml/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147216 2012-01-24 19:34:31Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgtkhtml
-pkgver=2.11.1
-pkgrel=4
-pkgdesc="An HTML library for GTK"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk2>=2.22.1' 'libxml2>=2.7.8')
-makedepends=('perlxml')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a1d1a197dcff8c4571659deef5495e24')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libpano13/PKGBUILD b/staging/libpano13/PKGBUILD
deleted file mode 100644
index c4d1054e6..000000000
--- a/staging/libpano13/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146959 2012-01-19 17:50:13Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libpano13
-pkgver=2.9.18
-pkgrel=2
-pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools"
-arch=('i686' 'x86_64')
-url="http://panotools.sourceforge.net/"
-license=('GPL2')
-depends=('libpng' 'libtiff')
-makedepends=('openjdk6')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME}
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libpng/PKGBUILD b/staging/libpng/PKGBUILD
deleted file mode 100644
index 433f422dd..000000000
--- a/staging/libpng/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146824 2012-01-18 19:24:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=libpng
-pkgver=1.5.7
-_apngver=1.5.7
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libpng.org/pub/png/libpng.html"
-license=('custom')
-depends=('zlib' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d'
-         '6c6a674048cec94db1bc35decf0d142c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-  install -m755 png2pnm pnm2png "$pkgdir/usr/bin/"
-  install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD
deleted file mode 100644
index d9a941c88..000000000
--- a/staging/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,917 +0,0 @@
-# $Id: PKGBUILD 147059 2012-01-21 10:23:48Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	#'libreoffice-extension-barcode' # 
-	'libreoffice-extension-diagram'
-	'libreoffice-extension-google-docs'
-	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-	'libreoffice-extension-nlpsolver'
-	'libreoffice-extension-ct2n'
-	'libreoffice-extension-numbertext'	
-	'libreoffice-extension-oooblogger'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
-	'libreoffice-extension-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-typo'
-	'libreoffice-extension-validator'
-	'libreoffice-extension-watch-window'
-	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.5.2
-pkgver=3.4.5
-pkgrel=2
-arch=('i686' 'x86_64')
-#_LO_tree="3.4"
-_OFFICEUPD="340"
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
-             'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the depends from libreoffice main pkg
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
-	     'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
-_additional_source_url="http://hg.services.openoffice.org/binaries"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_boost.diff
-	buildfix_ct2n.diff
-	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff)
-noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
-         'c1e2dabdf4cfcd5957779014a7f9787e'
-         '79c9c7fc208e7f56af09f284f261a7da'
-         'c83a8a374d3d5cc83c6ac3b5ff613e46'
-         'fa64799ebad8cbd2c160ac2f87bd5599'
-         'b24fba57aa4185934e86a0a8db4a3433'
-         '4f98020088ab9b597fc21b617121bd47'
-         '3c3be7c5f923339c90b0d1d6ecad0243'
-         '3a0bb4bb096b7488533ed2ee466a2bc9'
-         'f2b180aa1eff3884b4ca81c048f1e327'
-         'a9af488ef92ad4442eafba874249c529'
-         'db6a67c96a9090bc5e21b64e202a984e'
-         'e00187ae0840e1f6a00fa3290cacf0d1'
-         '20fbf6cffd2b06e90a52105b75a57828'
-         '4af055f590732ec19a2534b2278ac49c'
-         'c84693796d2b1d9c8269425b1fa53aef'
-         'd4926dc27b6884656feec6753f4fdf22'
-         '770678ca19cca0f7985c1c82b2dccf48'
-         '97a1e3de430b124faf35bf334248ad53'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '185d60944ea767075d27247c3162b3bc'
-         '90401bca927835b6fbae4a707ed187c8'
-         '451ccf439a36a568653b024534669971'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-	# move all LibO sources into one build directory
-	mkdir ${srcdir}/build && cd ${srcdir}/build
-	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
-	  mv ${srcdir}/$i/* .
-	done
-#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
-#	./bin/unpack-sources ${srcdir}/build
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-
-	cd ${srcdir}/build
-
-	# buildfixes & bugfixes
-	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
-	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	
-	# unset C(XX)FLAGS
-	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-#	unset CFLAGS
-#	unset CXXFLAGS
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-#	if [ "$CARCH" = "x86_64" ]; then
-#	      EXTRAOPTS="--without-stlport"
-#	 else 
-#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-#	      # # avoid problems with ixion for now
-#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-#	fi
-
-	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-cairo\
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-ldap \
-		--enable-lockdown\
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-barcode \
-		--enable-ext-diagram \
-		--enable-ext-google-docs \
-		--enable-ext-hunart \
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-ext-nlpsolver \
-		--enable-ext-ct2n \
-		--enable-ext-numbertext \
-		--enable-ext-oooblogger \
-		--enable-ext-pdfimport \
-		--enable-ext-presenter-console \
-		--enable-ext-presenter-minimizer \
-		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-scripting-python \
-		--enable-ext-typo \
-		--enable-ext-validator \
-		--enable-ext-watch-window \
-		--enable-ext-wiki-publisher \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--with-system-libtextcat \
-		--with-external-libtextcat-data \
-		--with-openldap\
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mozilla\
-		--with-system-mythes\
-		--with-system-xrender-headers\
-		--with-system-headers\
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	unset MAKEFLAGS
-	./bootstrap
-	make
-	
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'libldap:          to get profiles via ldap'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/staging/libreoffice/PKGBUILD.next_stable b/staging/libreoffice/PKGBUILD.next_stable
deleted file mode 100644
index a8cb4c5ad..000000000
--- a/staging/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/staging/libreoffice/PKGBUILD.next_stable34 b/staging/libreoffice/PKGBUILD.next_stable34
deleted file mode 100644
index 5b9dec2ab..000000000
--- a/staging/libreoffice/PKGBUILD.next_stable34
+++ /dev/null
@@ -1,925 +0,0 @@
-# $Id: PKGBUILD 145674 2011-12-26 20:12:16Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	#'libreoffice-extension-barcode' # 
-	'libreoffice-extension-diagram'
-	'libreoffice-extension-google-docs'
-	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-	'libreoffice-extension-nlpsolver'
-	'libreoffice-extension-ct2n'
-	'libreoffice-extension-numbertext'	
-	'libreoffice-extension-oooblogger'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
-	'libreoffice-extension-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-typo'
-	'libreoffice-extension-validator'
-	'libreoffice-extension-watch-window'
-	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.5.2
-pkgver=3.4.5rc2 # last expected release candidate (should become final ) - Release 3.4.5 	Week 2 , Jan 9 - Jan 15, 2012 
-pkgrel=1
-arch=('i686' 'x86_64')
-#_LO_tree="3.4"
-_OFFICEUPD="340"
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
-             'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the depends from libreoffice main pkg
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
-	     'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
-_additional_source_url="http://hg.services.openoffice.org/binaries"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_boost.diff
-	buildfix_ct2n.diff
-	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	#oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	#RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-	gcc462_buildfix.diff)
-noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
-         'c1e2dabdf4cfcd5957779014a7f9787e'
-         '79c9c7fc208e7f56af09f284f261a7da'
-         'c83a8a374d3d5cc83c6ac3b5ff613e46'
-         'fa64799ebad8cbd2c160ac2f87bd5599'
-         'b24fba57aa4185934e86a0a8db4a3433'
-         '4f98020088ab9b597fc21b617121bd47'
-         '3c3be7c5f923339c90b0d1d6ecad0243'
-         '3a0bb4bb096b7488533ed2ee466a2bc9'
-         'f2b180aa1eff3884b4ca81c048f1e327'
-         'a9af488ef92ad4442eafba874249c529'
-         'db6a67c96a9090bc5e21b64e202a984e'
-         'e00187ae0840e1f6a00fa3290cacf0d1'
-         '20fbf6cffd2b06e90a52105b75a57828'
-         '4af055f590732ec19a2534b2278ac49c'
-         'c84693796d2b1d9c8269425b1fa53aef'
-         'd4926dc27b6884656feec6753f4fdf22'
-         '770678ca19cca0f7985c1c82b2dccf48'
-         '97a1e3de430b124faf35bf334248ad53'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '185d60944ea767075d27247c3162b3bc'
-         '90401bca927835b6fbae4a707ed187c8'
-         '451ccf439a36a568653b024534669971'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '10600d04ee81014bc9b5cc04e615d799')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-	# move all LibO sources into one build directory
-	mkdir ${srcdir}/build && cd ${srcdir}/build
-	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
-	  mv ${srcdir}/$i/* .
-	done
-#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
-#	./bin/unpack-sources ${srcdir}/build
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-
-	cd ${srcdir}/build
-
-	# buildfixes & bugfixes
-	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
-	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	#patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	#patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
-#	patch -Np1 -i ${srcdir}/gcc462_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
-
-	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-#	if [ "$CARCH" = "x86_64" ]; then
-#	      EXTRAOPTS="--without-stlport"
-#	 else 
-#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-#	      # # avoid problems with ixion for now
-#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-#	fi
-
-	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-cairo\
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-ldap \
-		--enable-lockdown\
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-barcode \
-		--enable-ext-diagram \
-		--enable-ext-google-docs \
-		--enable-ext-hunart \
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-ext-nlpsolver \
-		--enable-ext-ct2n \
-		--enable-ext-numbertext \
-		--enable-ext-oooblogger \
-		--enable-ext-pdfimport \
-		--enable-ext-presenter-console \
-		--enable-ext-presenter-minimizer \
-		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-scripting-python \
-		--enable-ext-typo \
-		--enable-ext-validator \
-		--enable-ext-watch-window \
-		--enable-ext-wiki-publisher \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--with-system-libtextcat \
-		--with-external-libtextcat-data \
-		--with-openldap\
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mozilla\
-		--with-system-mythes\
-		--with-system-xrender-headers\
-		--with-system-headers\
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	unset MAKEFLAGS
-	./bootstrap
-	make
-	
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'libldap:          to get profiles via ldap'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/staging/libreoffice/buildfix_boost.diff b/staging/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/staging/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
-          template <int MaxDigits>
-          inline bool allow_more_digits(std::size_t i)
-          {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+ 
-+ #include "boost/optional/optional_fwd.hpp"
-+ 
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ //   When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+ 
-+   public:
-+ 
-++    aligned_storage()
-++    {
-++      memset(&dummy_, 0, sizeof(dummy_));
-++    }
-++
-+     void const* address() const { return &dummy_.data[0]; }
-+     void      * address()       { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/staging/libreoffice/buildfix_ct2n.diff b/staging/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/staging/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
- ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
- ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/staging/libreoffice/gcc462_buildfix.diff b/staging/libreoffice/gcc462_buildfix.diff
deleted file mode 100644
index c19e520dc..000000000
--- a/staging/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/staging/libreoffice/libreoffice.install b/staging/libreoffice/libreoffice.install
deleted file mode 100644
index cb0d393dd..000000000
--- a/staging/libreoffice/libreoffice.install
+++ /dev/null
@@ -1,50 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-#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
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-#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
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-#xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff b/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
- 
- #define BIN_FILE_BODY \
--        UnixRights   = 555
-+        UnixRights   = 755
- 
- #define TXT_FILE_BODY \
--        UnixRights   = 444
-+        UnixRights   = 644
- 
- #define USER_FILE_BODY \
-         UnixRights   = 644
diff --git a/staging/libreoffice/vbahelper.visibility.patch b/staging/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/staging/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
- 
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbaquerytable \
-         sc/source/ui/vba/vbarange \
-         sc/source/ui/vba/vbasheetobject \
--        sc/source/ui/vba/vbasheetobjects \
-         sc/source/ui/vba/vbastyle \
-         sc/source/ui/vba/vbastyles \
-         sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbawsfunction \
- ))
- 
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+        sc/source/ui/vba/vbasheetobjects \
-+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- 	$$(LDFLAGS) \
diff --git a/staging/librsvg/PKGBUILD b/staging/librsvg/PKGBUILD
deleted file mode 100644
index 90ffdcd13..000000000
--- a/staging/librsvg/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146839 2012-01-18 20:16:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.34.2
-pkgrel=2
-pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2')
-optdepends=('gtk2: for rsvg-view support')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz)
-sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
-      --with-croco --disable-static \
-      --with-svgz
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/librsvg/librsvg.install b/staging/librsvg/librsvg.install
deleted file mode 100644
index 4d48b071f..000000000
--- a/staging/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/staging/libtiff/PKGBUILD b/staging/libtiff/PKGBUILD
deleted file mode 100644
index 16d6dded5..000000000
--- a/staging/libtiff/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146823 2012-01-18 19:24:43Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=libtiff
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="Library for manipulation of TIFF images"
-arch=('i686' 'x86_64')
-url="http://www.remotesensing.org/libtiff/"
-license=('custom')
-depends=('libjpeg' 'zlib' 'xz')
-makedepends=('freeglut')
-optdepends=('freeglut: for using tiffgt')
-options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
-
-build() {
-  cd "${srcdir}/tiff-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/tiff-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/tiff-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/libunique3/PKGBUILD b/staging/libunique3/PKGBUILD
deleted file mode 100644
index f641e0925..000000000
--- a/staging/libunique3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146851 2012-01-18 20:41:52Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=libunique3
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="Library for writing single instance applications for GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-url="http://live.gnome.org/LibUnique"
-source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz)
-sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038')
-
-build() {
-  cd "$srcdir/libunique-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-dbus
-  make
-}
-
-package() {
-  cd "$srcdir/libunique-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/libvisual-plugins/02_64-bit_JESS_fix.patch b/staging/libvisual-plugins/02_64-bit_JESS_fix.patch
deleted file mode 100644
index 1d7f99e56..000000000
--- a/staging/libvisual-plugins/02_64-bit_JESS_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c
---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c	2006-02-06 05:47:26.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c	2007-07-04 18:12:58.000000000 +1000
-@@ -282,7 +282,7 @@
- 
- void render_deformation(JessPrivate *priv, int defmode)
- {
--	uint32_t bmax;
-+	intptr_t bmax;
- 	uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i;
- 	uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux;
- 
-@@ -294,7 +294,7 @@
- 		tab2 = priv->table2;
- 		tab3 = priv->table3;
- 		tab4 = priv->table4;
--		bmax = priv->resx * priv->resy + (uint32_t) priv->pixel;
-+		bmax = priv->resx * priv->resy + (intptr_t) priv->pixel;
- 
- 		switch(defmode)
- 		{
-@@ -352,7 +352,7 @@
- 		}
- 		for (i = 0; i < priv->resy * priv->resx; i++)
- 		{
--			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer);
-+			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer);
- 			*(pix++) = *(aux++) ;
- 			*(pix++) = *(aux++);  
- 			*(pix++) = *(aux);  
-@@ -373,7 +373,8 @@
- 	/* j'ai mis pixel par defaut... */
- 
- 	uint8_t *pix = priv->pixel;
--	uint32_t bmax,pitch_4;
-+	intptr_t bmax;
-+	uint32_t pitch_4;
- 	
- 	pix = priv->pixel;
- 	if (priv->pixel == NULL)
-@@ -387,7 +388,7 @@
- 	if (priv->video == 8)
- 	{
- 		if (visual_cpu_get_mmx ()) {
--			bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel;
-+			bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel;
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- 			__asm __volatile
- 				("\n\t pxor %%mm6, %%mm6"
-@@ -423,7 +424,7 @@
- 	else
- 	{
- 		pitch_4 = priv->pitch+4;
--		bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel;
-+		bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel;
- 
- 		if (visual_cpu_get_mmx ()) {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
diff --git a/staging/libvisual-plugins/03_build_against_gl_fixes.patch b/staging/libvisual-plugins/03_build_against_gl_fixes.patch
deleted file mode 100644
index b21558232..000000000
--- a/staging/libvisual-plugins/03_build_against_gl_fixes.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_bumpscope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_bumpscope_la_LDFLAGS = -module -avoid-version 
-+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_bumpscope_la_SOURCES = actor_bumpscope.c \
- 			  actor_bumpscope.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_corona.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- actor_corona_la_LDFLAGS = -module -avoid-version
-+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_corona_la_SOURCES = actor_corona.cpp \
- 			  autopal.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am	2006-02-24 00:34:48.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version 
-+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
- 
- actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_gstreamer.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_gstreamer_la_LDFLAGS = -module -avoid-version 
-+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
- 
- actor_gstreamer_la_SOURCES = actor_gstreamer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_infinite.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_infinite_la_LDFLAGS = -module -avoid-version 
-+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_infinite_la_SOURCES = compute.c compute.h \
- 			    display.c display.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_jakdaw.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_jakdaw_la_LDFLAGS = -module -avoid-version 
-+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_jakdaw_la_SOURCES = actor_jakdaw.c \
- 			  actor_jakdaw.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_JESS.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_JESS_la_LDFLAGS = -module -avoid-version
-+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
- 			distorsion.c distorsion.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_lv_analyzer_la_LDFLAGS = -module -avoid-version 
-+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_lv_gltest_la_LDFLAGS = -module -avoid-version 
--actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am	2006-02-23 20:03:29.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_scope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_lv_scope_la_LDFLAGS = -module -avoid-version 
-+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_scope_la_SOURCES = actor_lv_scope.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -10,5 +10,5 @@
- 
- actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
- actor_madspin_la_LDFLAGS = -module -avoid-version 
--actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
-+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
- actor_madspin_la_SOURCES = madspin.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am	2006-02-24 22:24:50.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_nastyfft_la_LDFLAGS = -module -avoid-version 
--actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
-+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
- actor_nastyfft_la_SOURCES = actor_nastyfft.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am	2006-02-23 20:03:31.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_oinksie.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_oinksie_la_LDFLAGS = -module -avoid-version 
-+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_oinksie_la_SOURCES = actor_oinksie.c\
- 			   oinksie.c oinksie.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am	2006-03-09 00:06:58.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,7 +4,7 @@
- 
- actor_flower_la_LDFLAGS = -module -avoid-version 
- actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
--actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- 
- actor_flower_la_SOURCES = \
- 	actor_flower.c \
-diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am	2006-02-23 20:03:35.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_alsa.la
- 
--LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_alsa_la_LDFLAGS = -module -avoid-version 
-+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
- 
- input_alsa_la_SOURCES = input_alsa.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am	2006-02-23 20:03:36.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_debug.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_debug_la_LDFLAGS = -module -avoid-version 
-+input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
- input_debug_la_SOURCES = input_debug.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_esd.la
- 
--LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- input_esd_la_LDFLAGS = -module -avoid-version 
-+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
- input_esd_la_SOURCES = input_esd.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- input_plugin_LTLIBRARIES = input_jack.la
- 
--LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_jack_la_LDFLAGS = -module -avoid-version 
-+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
- 
- input_jack_la_SOURCES = input_jack.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_mplayer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_mplayer_la_LDFLAGS = -module -avoid-version 
-+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
- input_mplayer_la_SOURCES = input_mplayer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_alphablend.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_alphablend_la_LDFLAGS = -module -avoid-version 
-+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_alphablend_la_SOURCES = morph_alphablend.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_flash.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_flash_la_LDFLAGS = -module -avoid-version 
-+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_flash_la_SOURCES = morph_flash.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_slide.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_slide_la_LDFLAGS = -module -avoid-version 
-+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_slide_la_SOURCES = morph_slide.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_tentacle.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_tentacle_la_LDFLAGS = -module -avoid-version 
-+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_tentacle_la_SOURCES = morph_tentacle.c
diff --git a/staging/libvisual-plugins/04_lv_analyzer_build_fix.patch b/staging/libvisual-plugins/04_lv_analyzer_build_fix.patch
deleted file mode 100644
index 1fc5f7fc7..000000000
--- a/staging/libvisual-plugins/04_lv_analyzer_build_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac
---- libvisual-plugins-0.4.0/configure.ac	2006-03-17 03:50:41.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/configure.ac	2007-07-04 18:22:38.000000000 +1000
-@@ -361,7 +361,7 @@
-   [ENABLE_ANALYZER=$enableval],
-   [ENABLE_ANALYZER=yes])
- 
--if test "$ENABLE_ANALYZER" = xyes; then
-+if test "$ENABLE_ANALYZER" = "yes"; then
-   build_actor_plugins="$build_actor_plugins lv_analyzer"
- fi
- 
diff --git a/staging/libvisual-plugins/050_all_automagic.patch b/staging/libvisual-plugins/050_all_automagic.patch
deleted file mode 100644
index 9c25fac72..000000000
--- a/staging/libvisual-plugins/050_all_automagic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac.old	2007-02-24 23:09:08.000000000 +0100
-+++ configure.ac	2007-02-24 23:13:15.000000000 +0100
-@@ -89,7 +89,18 @@
- 
- dnl Libraries
- 
-+dnl List of plugins to build
-+build_input_plugins=""
-+build_actor_plugins=""
-+build_morph_plugins=""
-+
- dnl EsounD
-+AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd],
-+	[Do not build esound input plugin @<:@default=enabled@:>@]),
-+	[ENABLE_INPUT_ESD=$enableval],
-+	[ENABLE_INPUT_ESD=yes])
-+
-+if test "$ENABLE_INPUT_ESD" = "yes"; then
- PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version],
-   [HAVE_ESD="yes"], [HAVE_ESD="no"])
- 
-@@ -98,8 +109,15 @@
- else
-   AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built])
- fi
-+fi
- 
- dnl JACK
-+AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack],
-+	[Do not build jack input plugin @<:@default=enabled@:>@]),
-+        [ENABLE_INPUT_JACK=$enableval],
-+	[ENABLE_INPUT_JACK=yes])
-+
-+if test "$ENABLE_INPUT_JACK" = "yes"; then
- PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"])
- if test "$HAVE_JACK" = "yes"; then
-   build_input_plugins="$build_input_plugins jack"
-@@ -107,11 +125,7 @@
-   AC_MSG_WARN([*** libjack is too old. You can download a newer version at
-              http://jackit.sf.net/. The jackit input plugin won't be built])
- fi
--
--dnl List of plugins to build
--build_input_plugins=""
--build_actor_plugins=""
--build_morph_plugins=""
-+fi
- 
- dnl GdkPixbuf
- AC_ARG_ENABLE([gdkpixbuf-plugin],
diff --git a/staging/libvisual-plugins/05_fix_po.patch b/staging/libvisual-plugins/05_fix_po.patch
deleted file mode 100644
index a5413ef1b..000000000
--- a/staging/libvisual-plugins/05_fix_po.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in
---- libvisual-plugins-0.4.0/po/Makefile.in.in	2006-03-21 05:48:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/po/Makefile.in.in	2007-07-09 21:50:13.000000000 +1000
-@@ -28,7 +28,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
-diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs
---- libvisual-plugins-0.4.0/po/mkinstalldirs	1970-01-01 10:00:00.000000000 +1000
-+++ libvisual-plugins-0.4.0.new/po/mkinstalldirs	2006-03-21 05:48:42.000000000 +1100
-@@ -0,0 +1,111 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+errstatus=0
-+dirmode=""
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage" 1>&2
-+      exit 0
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
-+
-+for file
-+do
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+case $dirmode in
-+  '')
-+    if mkdir -p -- . 2>/dev/null; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    fi
-+    ;;
-+esac
-+
-+for file
-+do
-+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+  shift
-+
-+  pathcomp=
-+  for d
-+  do
-+    pathcomp="$pathcomp$d"
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+  	errstatus=$lasterr
-+      else
-+  	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+    	  lasterr=""
-+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+  	  if test ! -z "$lasterr"; then
-+  	    errstatus=$lasterr
-+  	  fi
-+  	fi
-+      fi
-+    fi
-+
-+    pathcomp="$pathcomp/"
-+  done
-+done
-+
-+exit $errstatus
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# End:
-+# mkinstalldirs ends here
diff --git a/staging/libvisual-plugins/PKGBUILD b/staging/libvisual-plugins/PKGBUILD
deleted file mode 100644
index e5051502d..000000000
--- a/staging/libvisual-plugins/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 147964 2012-01-29 05:21:10Z eric $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=libvisual-plugins
-pkgver=0.4.0
-pkgrel=5
-pkgdesc="plugins for libvisual"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://www.localhost.nl/~synap/libvisual/"
-depends=('libvisual' 'gtk2' 'mesa' 'alsa-lib' 'jack')
-makedepends=('pkgconfig' 'namcap')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz
-        02_64-bit_JESS_fix.patch
-        03_build_against_gl_fixes.patch
-        04_lv_analyzer_build_fix.patch
-        05_fix_po.patch
-        050_all_automagic.patch)
-md5sums=('4330e9287f9d6fae02f482f428a1e77b'
-         'f9cfb607bfcbfef60830fae4e7dc6963'
-         '116701408747dbb87dc134434478ebe2'
-         '01678a8f1584c76a44e59d81003a1109'
-         '6189b7427c4e11c8b8d6c6266d6a1629'
-         'b50ae94c424a5f0af235deffa8451eb6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch"
-  patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch"
-  patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch"
-  patch -Np0 -i "${srcdir}/050_all_automagic.patch"
-
-  autoreconf -fi
-  # Apply later as autoreconf overwrites po/Makefile.in.in
-  patch -Np1 -i "${srcdir}/05_fix_po.patch"
-
-  ./configure --prefix=/usr \
-      --disable-gstreamer-plugin \
-      --disable-gforce \
-      --disable-esd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libwebkit/PKGBUILD b/staging/libwebkit/PKGBUILD
deleted file mode 100644
index 389f67bb5..000000000
--- a/staging/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 147026 2012-01-20 21:25:43Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
-options=('!libtool' '!emptydirs')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c11743694b1b71dad287b2e7a9e73b05')
-
-build() {
-  cd "${srcdir}/webkit-${pkgver}"
-  mkdir build-gtk{2,3}
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 )
-  ( cd build-gtk3 && _build --with-gtk=3.0 )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype --enable-gtk-doc \
-    --with-unicode-backend=icu \
-    --enable-spellcheck "$@"
-  make all stamp-po
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "${srcdir}/webkit-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
-}
diff --git a/staging/libwebkit/libwebkit.install b/staging/libwebkit/libwebkit.install
deleted file mode 100644
index 24072f316..000000000
--- a/staging/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/staging/libwmf/PKGBUILD b/staging/libwmf/PKGBUILD
deleted file mode 100644
index 0222a1832..000000000
--- a/staging/libwmf/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 146861 2012-01-18 21:36:12Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=libwmf
-pkgver=0.2.8.4
-pkgrel=9
-pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
-arch=('i686' 'x86_64')
-url="http://wvware.sourceforge.net/libwmf.html"
-license=('LGPL')
-depends=('libpng' 'libx11' 'libjpeg' 'gsfonts')
-makedepends=('gtk2' 'libxt')
-optdepends=('gdk-pixbuf2: for pixbuf loader')
-options=('!libtool' '!docs' '!emptydirs')
-install=libwmf.install
-source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz
-	libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch)
-sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89'
-          '42aa4c2a82e4e14044c875a7f439baea732a355a'
-          'ea6d28880840e86c96f9079bfd591da54dcffa5c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch"
-  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
-  ./configure --prefix=/usr \
-              --with-gsfontdir=/usr/share/fonts/Type1 \
-	      --with-fontdir=/usr/share/fonts/Type1 \
-	      --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  #Remove fonts, these are in gsfonts
-  rm -rf "${pkgdir}/usr/share/fonts"
-  #Remove static GTK loader, can't use it anyways
-  rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a
-}
diff --git a/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
deleted file mode 100644
index 3528c74eb..000000000
--- a/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
---- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h	2011-05-23 19:14:23.000000000 +0200
-+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2011-05-23 19:15:11.000000000 +0200
-@@ -66,7 +66,7 @@
- 		return;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
- 		png_destroy_write_struct (&png_ptr,&info_ptr);
- 		wmf_free (API,buffer);
diff --git a/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch b/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch
deleted file mode 100644
index 328c5411f..000000000
--- a/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list	2009-04-24 04:06:44.000000000 -0400
-+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c	2009-04-24 04:08:30.000000000 -0400
-@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
- 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
- 		if (more == 0) return;
- 		im->clip->max += 8;
-+                im->clip->list = more;
- 	}
- 	im->clip->list[im->clip->count] = (*rect);
- 	im->clip->count++;
diff --git a/staging/libwmf/libwmf.install b/staging/libwmf/libwmf.install
deleted file mode 100644
index 9c99a901b..000000000
--- a/staging/libwmf/libwmf.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then
-    gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/libxfcegui4/PKGBUILD b/staging/libxfcegui4/PKGBUILD
deleted file mode 100644
index d00dda2c5..000000000
--- a/staging/libxfcegui4/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 146865 2012-01-18 23:54:43Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=libxfcegui4
-pkgver=4.8.1
-pkgrel=4
-pkgdesc="Various Gtk widgets for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm'
-         'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/libxfcegui4/libxfcegui4.install b/staging/libxfcegui4/libxfcegui4.install
deleted file mode 100644
index abf924aa2..000000000
--- a/staging/libxfcegui4/libxfcegui4.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/links/PKGBUILD b/staging/links/PKGBUILD
deleted file mode 100644
index 185990ac7..000000000
--- a/staging/links/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 146834 2012-01-18 20:01:18Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=links
-pkgver=2.5
-pkgrel=1
-pkgdesc="A text WWW browser, similar to Lynx"
-arch=('i686' 'x86_64')
-url="http://links.twibright.com/"
-license=('GPL')
-depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm')
-makedepends=('libtiff' 'libpng' 'libxt')
-optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
-provides=('links-g')
-conflicts=('links-g')
-replaces=('links-g')
-source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
-sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c'
-          'f600e27c2a71184444f7dd07a10230aa44463a02')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  (cd intl; ./gen-intl; ./synclang)
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --enable-graphics --with-x --with-fb
-  make
-  mv links xlinks
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --disable-graphics --without-x  --without-fb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
-  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
-
-  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
-
-  install -d "${pkgdir}/usr/share/doc/links/calibration"
-  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
-}
diff --git a/staging/links/links.desktop b/staging/links/links.desktop
deleted file mode 100644
index 9d6338a5b..000000000
--- a/staging/links/links.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Links
-Exec=xlinks -g
-Icon=links_32x32.xpm
-Type=Application
-Terminal=false
-Categories=Network;WebBrowser;
diff --git a/staging/mail-notification/PKGBUILD b/staging/mail-notification/PKGBUILD
deleted file mode 100644
index 2867010e9..000000000
--- a/staging/mail-notification/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 146578 2012-01-13 20:32:35Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=mail-notification
-pkgver=5.4
-pkgrel=10
-pkgdesc="Tray icon application that informs you if you have new mail"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/mailnotify/"
-license=('GPL3' 'FDL')
-depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
-makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2')
-options=('!libtool' '!emptydirs')
-install=mail-notification.install
-source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2
-        dont-update-cache.patch
-        remove-ubuntu-special-case.patch
-        mail-notification-5.4-evolution.patch
-        mail-notification-5.4-sasl_encode64.patch
-        mail-notification-5.4-evolution-gtkhtml.patch
-        mail-notification-5.4-camel_headers.patch
-        mail-notification-5.4-icons.patch
-        mail-notification-5.4-weak.patch
-        mail-notification-5.4-popup-attach.patch
-        mail-notification-5.4-kde-trayicon.patch
-        mail-notification-5.4-evolution-3-0-support.patch
-        mail-notification-5.4-gtk3-support.patch
-        mail-notification-5.4-add-fallback-icon.patch
-        mail-notification-5.4-gmime.patch
-        mail-notification-5.4-libx11.patch)
-md5sums=('c8dc33a61251acb5474e56eab6b18f43'
-         '6007bc30e789dab0a8282038e0335eb9'
-         '9cadd61bbd9c324b2916ec980231e0f2'
-         'aa6f80820899f904c25988772f70ade9'
-         '125513ed059f62469377eb0ab794dbed'
-         'c595a3962ab13a65be24a941e28faa9c'
-         'f79939f593b2e8659e302df72c2b54b1'
-         '244b7ef2aec7656e8df390be87c10e2b'
-         '31bde95dfd39449959d8b3316f91429c'
-         'cdead6a88d1779f69a5f40dc75d5cb84'
-         'c7991b831834724eddc1c6802c3e06a6'
-         'b370b1085ebb2814bd5d345a6d2b45ea'
-         '1ba948759110787dd57097cff157b75a'
-         '09df61b4dc29c676ac81ff9054e840ac'
-         '0944695e9b9b30f39028f85c83c6a7e2'
-         'c3f643ef16aab3b4fe9ff5b333bff41a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/dont-update-cache.patch"
-  patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-icons.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-weak.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-popup-attach.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-kde-trayicon.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-gmime.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-libx11.patch"
-
-  gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui
-  gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui
-
-  ./jb configure prefix=/usr sysconfdir=/etc \
-      localstatedir=/var destdir="${pkgdir}" \
-      gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=no \
-      cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
-      library-mode=0755
-  ./jb build
-  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install
-
-  rm -f "${pkgdir}/usr/share/mail-notification/"*.glade
-  install -m644 ui/mailbox-properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
-  install -m644 ui/properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain mail-notification ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/mail-notification/dont-update-cache.patch b/staging/mail-notification/dont-update-cache.patch
deleted file mode 100644
index 81216835e..000000000
--- a/staging/mail-notification/dont-update-cache.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- jbsrc/jb.c.~1~	2008-03-20 16:53:02.000000000 +0100
-+++ jbsrc/jb.c	2008-03-26 20:51:45.641363619 +0100
-@@ -327,7 +327,6 @@
- jb_package_add_resources (void)
- {
-   JBGroup *group;
--  JBRule *rule;
-   JBObject *object;
- 
-   if (jb_variable_get_bool("compile-warnings"))
-@@ -362,11 +361,6 @@
-   if (jb_variable_get_bool("hotmail"))
-     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
- 
--  rule = jb_rule_new();
--  jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
--  jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
--  jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
--
-   jb_group_add(group);
- 
-   /*** data ******************************************************************/
diff --git a/staging/mail-notification/mail-notification-5.4-add-fallback-icon.patch b/staging/mail-notification/mail-notification-5.4-add-fallback-icon.patch
deleted file mode 100644
index 41c28e870..000000000
--- a/staging/mail-notification/mail-notification-5.4-add-fallback-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/mn-stock.c.orig	2011-02-17 17:42:39.886767087 +0100
-+++ src/mn-stock.c	2011-02-17 17:49:37.415541177 +0100
-@@ -86,6 +86,13 @@
- 	  gtk_icon_source_set_icon_name(icon_source, icons[i].icon_name);
- 	  gtk_icon_set_add_source(icon_set, icon_source);
- 	  gtk_icon_source_free(icon_source);
-+
-+          /* Add a fallback icon */
-+          icon_source = gtk_icon_source_new();
-+          gtk_icon_source_set_icon_name(icon_source, "mail-notification");
-+          gtk_icon_source_set_state_wildcarded(icon_source, TRUE);
-+          gtk_icon_set_add_source(icon_set, icon_source);
-+          gtk_icon_source_free(icon_source);
- 	}
-       else if (icons[i].source_stock_id)
- 	{
diff --git a/staging/mail-notification/mail-notification-5.4-camel_headers.patch b/staging/mail-notification/mail-notification-5.4-camel_headers.patch
deleted file mode 100644
index 861e3d215..000000000
--- a/staging/mail-notification/mail-notification-5.4-camel_headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-message.c mail-notification-5.4-OK/build/src/mn-evolution-message.c
---- mail-notification-5.4/build/src/mn-evolution-message.c	2008-05-22 19:47:51.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-message.c	2010-05-04 18:13:31.000000000 +0400
-@@ -25,7 +25,7 @@
- #line 24 "src/mn-evolution-message.gob"
- 
- #include <glib/gi18n.h>
--#include <camel/camel-folder-summary.h>
-+#include <camel/camel.h>
- #include "mn-evolution-mailbox.h"
- #include "mn-message-private.h"
- #include "mn-evolution-client.h"
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
---- mail-notification-5.4/build/src/mn-evolution-server.c	2010-05-04 18:12:56.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-05-04 18:13:39.000000000 +0400
-@@ -28,7 +28,7 @@
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
- #include <libedataserver/eds-version.h>
--#include <camel/camel-folder.h>
-+#include <camel/camel.h>
- #if EDS_CHECK_VERSION(2,29,0)
- #include <shell/e-shell.h>
- #include <mail/e-mail-browser.h>
-diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
---- mail-notification-5.4/src/mn-evolution-plugin.c	2010-05-04 18:12:56.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-05-04 18:13:20.000000000 +0400
-@@ -24,7 +24,7 @@
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
--#include <camel/camel-folder.h>
-+#include <camel/camel.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
diff --git a/staging/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/staging/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
deleted file mode 100644
index 51938b5fa..000000000
--- a/staging/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30	2011-02-02 00:09:33.945696868 +0100
-+++ jbsrc/lib/src/extras/jb-evolution-plugin.c	2011-02-02 00:28:09.096275028 +0100
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-+  packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
-@@ -53,7 +53,7 @@
-       char *plugindir;
- 
-       jb_message_checking("for the Evolution plugin directory");
--      plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
-+      plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir");
-       jb_message_result_string(plugindir ? plugindir : "not found");
- 
-       if (! plugindir)
---- src/mn-evolution-plugin.c.orig	2011-02-09 00:07:37.422002566 +0100
-+++ src/mn-evolution-plugin.c	2011-02-09 00:12:43.652678682 +0100
-@@ -25,6 +25,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
- #include <camel/camel.h>
-+#include <libedataserver/eds-version.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
-@@ -240,7 +241,11 @@
- 					       EMEventTargetFolder *folder)
- {
-   if (evo_server)
-+#if EDS_CHECK_VERSION(3,1,0)
-+    mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name));
-+#else
-     mn_evolution_server_folder_changed(evo_server, folder->uri);
-+#endif
- }
- 
- void
-@@ -249,10 +250,16 @@
- {
-   if (evo_server)
-     {
--      char *url;
-+#if EDS_CHECK_VERSION(2,91,0)
-+      const char *url = camel_folder_get_uri(message->folder);
-+#else
-+      char *url = mail_tools_folder_to_url(message->folder);
-+#endif
-
--      url = mail_tools_folder_to_url(message->folder);
-       mn_evolution_server_message_reading(evo_server, url);
-+
-+#if !EDS_CHECK_VERSION(2,91,0)
-       g_free(url);
-+#endif
-     }
- }
---- build/src/mn-evolution-server.c.orig	2011-02-09 00:17:38.850944227 +0100
-+++ build/src/mn-evolution-server.c	2011-02-09 22:21:54.155346478 +0100
-@@ -496,11 +496,15 @@
- 
-     if (! folder)
-       {
--	folder = mail_tool_uri_to_folder(uri, 0,
- #if EDS_CHECK_VERSION(2,91,0)
--	      NULL,
-+        static EMailSession * session = NULL;
-+        if (!session)
-+          session = e_mail_session_new();
-+
-+        folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL);
-+#else
-+	folder = mail_tool_uri_to_folder(uri, 0, NULL);
- #endif
--	      NULL);
- 	if (folder)
- 	  self_cache_folder(uri, folder);
- 	else
-@@ -677,7 +681,12 @@
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(3,1,0)
-+	*ret = g_strdup(camel_folder_get_display_name(folder));
-+#else
- 	*ret = g_strdup(camel_folder_get_name(folder));
-+#endif
-+
- #if EDS_CHECK_VERSION(2,31,0)
- 	g_object_unref(folder);
- #else
-@@ -725,8 +734,12 @@
- 	shell = e_shell_get_default ();
- 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
- 
--	browser = e_mail_browser_new (shell_backend);
-+	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
-+#if EDS_CHECK_VERSION(3,1,0)
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
-+#else
- 	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+#endif
- 	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
- 	gtk_widget_show (browser);
- #else
---- build/src/mn-evolution-folder-tree-server.c.orig	2011-06-17 22:01:49.226886994 +0200
-+++ build/src/mn-evolution-folder-tree-server.c	2011-06-18 00:34:23.046889847 +0200
-@@ -444,7 +444,9 @@
- {
- #line 61 "src/mn-evolution-folder-tree-server.gob"
- 	
--#if EDS_CHECK_VERSION(2,91,0)
-+#if EDS_CHECK_VERSION(3,1,0)
-+    selfp->tree = em_folder_tree_new(NULL, NULL);
-+#elif EDS_CHECK_VERSION(2,91,0)
-     selfp->session = e_mail_session_new();
-     selfp->tree = em_folder_tree_new(selfp->session);
- #elif EDS_CHECK_VERSION(2,29,0)
diff --git a/staging/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch b/staging/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch
deleted file mode 100644
index 283ef36d6..000000000
--- a/staging/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c
---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2008-04-27 18:47:43.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-08-21 19:48:22.000000000 +0400
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
diff --git a/staging/mail-notification/mail-notification-5.4-evolution.patch b/staging/mail-notification/mail-notification-5.4-evolution.patch
deleted file mode 100644
index 87514c22d..000000000
--- a/staging/mail-notification/mail-notification-5.4-evolution.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c
---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c	2010-10-12 16:50:15.000000000 +0400
-@@ -25,7 +25,10 @@
- #line 24 "src/mn-evolution-folder-tree-server.gob"
- 
- #include <dbus/dbus.h>
-+#include <libedataserver/eds-version.h>
-+#if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-+#endif
- #include <mail/em-folder-tree.h>
- #include "mn-evolution-plugin.h"
- #include "mn-evolution.h"
-@@ -441,10 +444,17 @@
- {
- #line 61 "src/mn-evolution-folder-tree-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,91,0)
-+    selfp->session = e_mail_session_new();
-+    selfp->tree = em_folder_tree_new(selfp->session);
-+#elif EDS_CHECK_VERSION(2,29,0)
-+    selfp->tree = em_folder_tree_new();
-+#else
-     EMFolderTreeModel *model;
- 
-     model = mail_component_peek_tree_model(mail_component_peek());
-     selfp->tree = em_folder_tree_new_with_model(model);
-+#endif
- 
-     selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
-     gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
-@@ -469,6 +479,10 @@
- {
- #line 80 "src/mn-evolution-folder-tree-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,91,0)
-+    g_object_unref(selfp->session);
-+    selfp->session = NULL;
-+#endif
-     g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self);
-   }}
- #line 475 "mn-evolution-folder-tree-server.c"
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
---- mail-notification-5.4/build/src/mn-evolution-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-10-12 16:50:40.000000000 +0400
-@@ -27,12 +27,22 @@
- #include <stdio.h>
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
-+#include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
-+#if EDS_CHECK_VERSION(2,29,0)
-+#include <shell/e-shell.h>
-+#include <mail/e-mail-browser.h>
-+#else
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
- #include <mail/em-message-browser.h>
-+#endif
- #include <mail/em-utils.h>
-+#if EDS_CHECK_VERSION(2,91,0)
-+#include <mail/e-mail-session.h>
-+#else
- #include <mail/mail-session.h>
-+#endif
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
- #include "mn-evolution-folder-tree-server.h"
-@@ -391,10 +397,18 @@
-     info = g_new0(FolderInfo, 1);
-     info->uri = g_strdup(uri);
-     info->folder = folder;
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_object_ref(folder);
-+#else
-     camel_object_ref(folder);
-+#endif
- 
-     /* uncache the folder when it is deleted */
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_signal_connect(folder, "deleted", G_CALLBACK(self_folder_deleted_cb), info);
-+#else
-     camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info);
-+#endif
- 
-     g_hash_table_replace(folders, info->uri, info);
-   }}
-@@ -413,8 +427,13 @@
- {
- #line 105 "src/mn-evolution-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_signal_handlers_disconnect_by_func(info->folder, self_folder_deleted_cb, info);
-+    g_object_unref(info->folder);
-+#else
-     camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info);
-     camel_object_unref(info->folder);
-+#endif
-     g_free(info->uri);
-     g_free(info);
-   }}
-@@ -461,7 +480,11 @@
- 	if (info)
- 	  {
- 	    folder = info->folder;
-+#if EDS_CHECK_VERSION(2,31,0)
-+	    g_object_ref(folder);
-+#else
- 	    camel_object_ref(folder);
-+#endif
- 	  }
-       }
-     else
-@@ -469,7 +492,11 @@
- 
-     if (! folder)
-       {
--	folder = mail_tool_uri_to_folder(uri, 0, NULL);
-+	folder = mail_tool_uri_to_folder(uri, 0,
-+#if EDS_CHECK_VERSION(2,91,0)
-+	      NULL,
-+#endif
-+	      NULL);
- 	if (folder)
- 	  self_cache_folder(uri, folder);
- 	else
-@@ -595,14 +622,23 @@
- 
- 	for (i = 0; i < summary->len; i++)
- 	  {
-+#if EDS_CHECK_VERSION(2,23,5)
-+	    char *uid = summary->pdata[i];
-+	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
-+#else
- 	    CamelMessageInfo *info = summary->pdata[i];
-+#endif
- 
- 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
- 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
- 	  }
- 
- 	camel_folder_free_summary(folder, summary);
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -638,7 +674,11 @@
-     if (folder)
-       {
- 	*ret = g_strdup(camel_folder_get_name(folder));
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -673,6 +713,19 @@
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(2,29,0)
-+	EShell *shell;
-+	EShellBackend *shell_backend;
-+	GtkWidget *browser;
-+
-+	shell = e_shell_get_default ();
-+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
-+
-+	browser = e_mail_browser_new (shell_backend);
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
-+	gtk_widget_show (browser);
-+#else
- 	GtkWidget *browser;
- 
- 	/* modelled after Evolution's handleuri_got_folder() */
-@@ -683,8 +736,13 @@
- 	em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
- 	em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
- 	gtk_widget_show(((EMMessageBrowser *) browser)->window);
-+#endif
- 
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -721,7 +779,11 @@
-     if (folder)
-       {
- 	status = camel_folder_set_message_flags(folder, message_uid, flags, flags);
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
- 
- 	if (! status)
- 	  g_set_error(err,
-diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
---- mail-notification-5.4/src/mn-evolution-plugin.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-10-12 16:50:15.000000000 +0400
-@@ -204,7 +204,7 @@
- }
- 
- int
--e_plugin_lib_enable (EPluginLib *ep, int enable)
-+e_plugin_lib_enable (EPlugin *ep, int enable)
- {
-   static gboolean enabled = FALSE;
-   GError *err = NULL;
---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.orig	2010-11-13 13:55:01.571934066 +0100
-+++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h	2010-11-13 13:56:07.019487418 +0100
-@@ -4,6 +4,10 @@
- #define __MN_EVOLUTION_FOLDER_TREE_SERVER_PRIVATE_H__
- 
- #include "mn-evolution-folder-tree-server.h"
-+#include <libedataserver/eds-version.h>
-+#if EDS_CHECK_VERSION(2,91,0)
-+#include <mail/e-mail-session.h>
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -23,6 +23,9 @@
- #line 41 "src/mn-evolution-folder-tree-server.gob"
- 	GtkWidget * tree;
- #line 26 "mn-evolution-folder-tree-server-private.h"
-+#if EDS_CHECK_VERSION(2,91,0)
-+       EMailSession * session;
-+#endif
- };
- 
- #ifdef __cplusplus
diff --git a/staging/mail-notification/mail-notification-5.4-gmime.patch b/staging/mail-notification/mail-notification-5.4-gmime.patch
deleted file mode 100644
index 5f516a46b..000000000
--- a/staging/mail-notification/mail-notification-5.4-gmime.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:28.000000000 +0300
-@@ -265,7 +265,7 @@
- 	    mime_message = g_mime_parser_construct_message(parser);
- 	    if (mime_message)
- 	      {
--		if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
-+		if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
- 		  {
- #if WITH_MOZILLA
- 		    type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
-diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:46:47.000000000 +0300
-@@ -167,7 +167,7 @@
- 	
-     const char *header;
- 
--    header = g_mime_message_get_header(mime_message, header_name);
-+    header = g_mime_object_get_header(mime_message, header_name);
-     if (header && mn_str_ishex(header))
-       return strtol(header, NULL, 16);
-     else
-diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c
---- mail-notification-5.4/jbsrc/jb.c	2008-05-22 19:47:04.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/jb.c	2008-12-23 14:43:09.000000000 +0300
-@@ -166,7 +166,7 @@
-   jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
--  jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
-+  jb_check_packages_for_options("GMime", "gmime", "gmime-2.6",
- 				"hotmail",
- 				"imap",
- 				"maildir",
-diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c
---- mail-notification-5.4/src/mn-message-mime.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-message-mime.c	2008-12-23 14:46:35.000000000 +0300
-@@ -33,12 +33,12 @@
-   g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
- 
-   /* SpamAssassin */
--  spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
-+  spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-   /* bogofilter */
--  spam = g_mime_message_get_header(mime_message, "X-Bogosity");
-+  spam = g_mime_object_get_header(mime_message, "X-Bogosity");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-@@ -89,7 +89,7 @@
-     {
-       const char *status;
- 
--      status = g_mime_message_get_header(mime_message, "Status");
-+      status = g_mime_object_get_header(mime_message, "Status");
-       if (status && strchr(status, 'R'))
- 	return NULL;		/* the message was read */
-       else if (status && strchr(status, 'O'))
diff --git a/staging/mail-notification/mail-notification-5.4-gtk3-support.patch b/staging/mail-notification/mail-notification-5.4-gtk3-support.patch
deleted file mode 100644
index 6a29f8622..000000000
--- a/staging/mail-notification/mail-notification-5.4-gtk3-support.patch
+++ /dev/null
@@ -1,1416 +0,0 @@
---- build/src/mn-dialog.c.orig	2011-02-02 23:08:09.816659245 +0100
-+++ build/src/mn-dialog.c	2011-02-02 23:09:16.988113774 +0100
-@@ -106,8 +106,7 @@
- #line 27 "src/mn-dialog.gob"
- 
-     gtk_container_set_border_width(GTK_CONTAINER(self), 5);
--    gtk_dialog_set_has_separator(GTK_DIALOG(self), FALSE);
--    gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(self)->vbox), 2);
-+    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(self))), 2);
-   
- #line 113 "mn-dialog.c"
-  }
---- jbsrc/jb.c.orig	2011-02-02 23:40:33.567924712 +0100
-+++ jbsrc/jb.c	2011-02-02 23:39:39.680803618 +0100
-@@ -163,7 +163,7 @@
- {
-   jb_check_glibc();
- 
--  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-+  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
-   jb_check_packages_for_options("GMime", "gmime", "gmime-2.6",
---- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:38:01.503049512 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-02 23:38:16.988222034 +0100
-@@ -358,7 +358,7 @@
- 	g_signal_connect(selfp->dialog, "response", G_CALLBACK(self_response_h), self);
-       }
- 
--    if (! GTK_WIDGET_VISIBLE(selfp->dialog))
-+    if (! gtk_widget_get_visible(selfp->dialog))
-       {
- 	GtkWindow *parent;
- 
---- build/src/mn-sound-player.c.orig	2011-02-02 23:55:02.436500397 +0100
-+++ build/src/mn-sound-player.c	2011-02-02 23:55:09.125141055 +0100
-@@ -27,7 +27,7 @@
- #include <sys/types.h>
- #include <signal.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-conf.h"
- #include "mn-locked-callback.h"
- #include "mn-util.h"
---- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:55:21.857457045 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-02 23:55:30.422996901 +0100
-@@ -25,7 +25,7 @@
- #line 39 "src/mn-file-chooser-button.gob"
- 
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- 
- #line 32 "mn-file-chooser-button.c"
---- build/src/mn-message.c.orig	2011-02-02 23:55:41.160420099 +0100
-+++ build/src/mn-message.c	2011-02-02 23:55:47.755065850 +0100
-@@ -26,7 +26,7 @@
- 
- #include <errno.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include "mn-conf.h"
- #include "mn-util.h"
---- build/src/mn-file-chooser-button.c.orig	2011-02-03 00:15:16.178407712 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-03 00:18:17.865681563 +0100
-@@ -463,6 +463,7 @@
- 
-     GDK_THREADS_ENTER();
- 
-+#if 0
-     if (results)
-       {
- 	GnomeVFSGetFileInfoResult *result = results->data;
-@@ -494,6 +495,7 @@
- 	      }
- 	  }
-       }
-+#endif
- 
-     selfp->async_handle = NULL;
-     g_object_unref(self);
---- build/src/mn-evolution-folder-tree-server.c.orig	2011-02-07 20:17:09.574274620 +0100
-+++ build/src/mn-evolution-folder-tree-server.c	2011-02-07 20:23:25.196053994 +0100
-@@ -25,6 +25,7 @@
- #line 24 "src/mn-evolution-folder-tree-server.gob"
- 
- #include <dbus/dbus.h>
-+#include <gtk/gtkx.h>
- #include <libedataserver/eds-version.h>
- #if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-@@ -71,7 +72,7 @@
- static void mn_evolution_folder_tree_server_finalize (MNEvolutionFolderTreeServer * self);
- #line 70 "mn-evolution-folder-tree-server.c"
- #line 84 "src/mn-evolution-folder-tree-server.gob"
--static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data);
-+static void mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data);
- #line 73 "mn-evolution-folder-tree-server.c"
- #line 104 "src/mn-evolution-folder-tree-server.gob"
- static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data);
-@@ -456,7 +457,7 @@
-     selfp->tree = em_folder_tree_new_with_model(model);
- #endif
- 
--    selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
-+    selfp->plug = gtk_plug_new((Window) selfp->id);
-     gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
-     gtk_widget_show_all(selfp->plug);
- 
-@@ -490,7 +491,7 @@
- 
- #line 84 "src/mn-evolution-folder-tree-server.gob"
- static void 
--mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data)
-+mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data)
- {
- #line 482 "mn-evolution-folder-tree-server.c"
- #define __GOB_FUNCTION__ "MN:Evolution:Folder:Tree:Server::plug_destroy_h"
---- src/eggtrayicon.h.orig	2011-02-07 20:25:26.352057350 +0100
-+++ src/eggtrayicon.h	2011-02-07 20:27:54.495032920 +0100
-@@ -23,10 +23,9 @@
- #ifndef __EGG_TRAY_ICON_H__
- #define __EGG_TRAY_ICON_H__
- 
--#include <gtk/gtkplug.h>
--#ifdef GDK_WINDOWING_X11
-+#include <gtk/gtk.h>
-+#include <gtk/gtkx.h>
- #include <gdk/gdkx.h>
--#endif
- 
- G_BEGIN_DECLS
- 
---- build/src/mn-mail-icon.c.orig	2011-02-07 20:24:58.971663075 +0100
-+++ build/src/mn-mail-icon.c	2011-02-07 20:30:33.714401306 +0100
-@@ -833,11 +833,13 @@
- #line 239 "src/mn-mail-icon.gob"
- 	
-     GtkWidget *widget = user_data;
-+    GtkAllocation allocation;
- 
--    gdk_window_get_origin(widget->window, x, y);
-+    gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
-+    gtk_widget_get_allocation(widget, &allocation);
- 
--    *x += widget->allocation.x;
--    *y += widget->allocation.y;
-+    *x += allocation.x;
-+    *y += allocation.y;
- 
-     if (*y > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2)
-       {
-@@ -847,7 +849,7 @@
- 	*y -= req.height;
-       }
-     else
--      *y += widget->allocation.height;
-+      *y += allocation.height;
- 
-     *push_in = TRUE;
-   }}
---- build/src/mn-mail-icon-widget.c.orig	2011-02-07 20:31:19.475816763 +0100
-+++ build/src/mn-mail-icon-widget.c	2011-02-07 21:53:48.858814715 +0100
-@@ -64,9 +64,13 @@
- #line 65 "mn-mail-icon-widget.c"
- #line 110 "src/mn-mail-icon-widget.gob"
- static void ___7_mn_mail_icon_widget_size_request (GtkWidget * widget, GtkRequisition * requisition);
-+static void
-+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint  *minimal_width, gint *natural_width);
-+static void
-+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height);
- #line 68 "mn-mail-icon-widget.c"
- #line 132 "src/mn-mail-icon-widget.gob"
--static gboolean ___8_mn_mail_icon_widget_expose_event (GtkWidget * widget, GdkEventExpose * event);
-+static gboolean ___8_mn_mail_icon_widget_draw (GtkWidget * widget, cairo_t *cr);
- #line 71 "mn-mail-icon-widget.c"
- #line 244 "src/mn-mail-icon-widget.gob"
- static GdkPixbuf * mn_mail_icon_widget_render_icon (MNMailIconWidget * self);
-@@ -187,9 +191,10 @@
- 	parent_class = g_type_class_ref (GTK_TYPE_WIDGET);
- 
- #line 110 "src/mn-mail-icon-widget.gob"
--	gtk_widget_class->size_request = ___7_mn_mail_icon_widget_size_request;
-+	gtk_widget_class->get_preferred_width = mn_mail_icon_widget_get_preferred_width;
-+	gtk_widget_class->get_preferred_height = mn_mail_icon_widget_get_preferred_height;
- #line 132 "src/mn-mail-icon-widget.gob"
--	gtk_widget_class->expose_event = ___8_mn_mail_icon_widget_expose_event;
-+	gtk_widget_class->draw = ___8_mn_mail_icon_widget_draw;
- #line 194 "mn-mail-icon-widget.c"
- 	g_object_class->dispose = ___dispose;
- 	g_object_class->finalize = ___finalize;
-@@ -234,7 +239,7 @@
-  {
- #line 93 "src/mn-mail-icon-widget.gob"
- 
--    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
-+    gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
- 
-     gtk_widget_set_name(GTK_WIDGET(self), "mn-mail-icon");
- 
-@@ -457,9 +462,28 @@
- #undef __GOB_FUNCTION__
- #undef PARENT_HANDLER
- 
-+static void
-+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint  *minimal_width, gint *natural_width)
-+{
-+    GtkRequisition requisition;
-+
-+    ___7_mn_mail_icon_widget_size_request (widget, &requisition);
-+    *minimal_width = *natural_width = requisition.width;
-+}
-+
-+static void
-+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
-+{
-+    GtkRequisition requisition;
-+
-+    ___7_mn_mail_icon_widget_size_request (widget, &requisition);
-+
-+    *minimal_height = *natural_height = requisition.height;
-+}
-+
- #line 132 "src/mn-mail-icon-widget.gob"
- static gboolean 
--___8_mn_mail_icon_widget_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-+___8_mn_mail_icon_widget_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr)
- #line 464 "mn-mail-icon-widget.c"
- #define PARENT_HANDLER(___widget,___event) \
- 	((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
-@@ -472,7 +496,7 @@
- 	
-     Self *self = SELF(widget);
- 
--    if (! GTK_WIDGET_DRAWABLE(widget) || ! selfp->stock_id)
-+    if (! gtk_widget_is_drawable(widget) || ! selfp->stock_id)
-       return FALSE;
- 
-     if (selfp->is_on)
-@@ -480,23 +504,34 @@
- 	int x;
- 	int y;
- 	GdkRectangle image_area;
-+        GtkAllocation allocation;
-+        GtkRequisition requisition;
- 
- 	/* note: widget->requisition is the pixbuf size, see size_request() */
- 
--	x = floor(widget->allocation.x + ((widget->allocation.width - widget->requisition.width) * ICON_XALIGN));
--	y = floor(widget->allocation.y + ((widget->allocation.height - widget->requisition.height) * ICON_YALIGN));
-+        gtk_widget_get_allocation(widget, &allocation);
-+        gtk_widget_get_requisition(widget, &requisition);
-+
-+	x = floor(allocation.x + ((allocation.width - requisition.width) * ICON_XALIGN));
-+	y = floor(allocation.y + ((allocation.height - requisition.height) * ICON_YALIGN));
- 
- 	image_area.x = x;
- 	image_area.y = y;
--	image_area.width = widget->requisition.width;
--	image_area.height = widget->requisition.height;
-+	image_area.width = requisition.width;
-+	image_area.height = requisition.height;
- 
-+#if 0
- 	if (gdk_rectangle_intersect(&event->area, &image_area, &image_area))
-+#endif
- 	  {
- 	    GdkPixbuf *pixbuf;
- 
- 	    pixbuf = self_render_icon(self);
-+            gdk_cairo_set_source_pixbuf(cr, pixbuf, image_area.x, image_area.y);
-+            cairo_move_to(cr, image_area.x - x, image_area.y - y);
-+            cairo_paint(cr);
- 
-+#if 0
- 	    gdk_draw_pixbuf(widget->window,
- 			    NULL,
- 			    pixbuf,
-@@ -509,6 +544,7 @@
- 			    GDK_RGB_DITHER_NORMAL,
- 			    0,
- 			    0);
-+#endif
- 
- 	    g_object_unref(pixbuf);
- 	  }
-@@ -523,13 +559,16 @@
- 	int box_y;
- 	int box_width;
- 	int box_height;
-+        GtkAllocation allocation;
-+
-+        gtk_widget_get_allocation(widget, &allocation);
- 
- 	if (! selfp->count_layout)
- 	  {
- 	    const char *size;
- 	    char *markup;
- 
--	    if (widget->allocation.height < 32)
-+	    if (allocation.height < 32)
- 	      size = "small";
- 	    else
- 	      size = "medium";
-@@ -546,17 +585,16 @@
- 	box_width = count_rect.width + COUNT_BOX_XPAD * 2;
- 	box_height = count_rect.height + COUNT_BOX_YPAD * 2;
- 
--	box_x = widget->allocation.x + widget->allocation.width - box_width - COUNT_BOX_XMARGIN;
--	box_y = widget->allocation.y + widget->allocation.height - box_height - COUNT_BOX_YMARGIN;
-+	box_x = allocation.x + allocation.width - box_width - COUNT_BOX_XMARGIN;
-+	box_y = allocation.y + allocation.height - box_height - COUNT_BOX_YMARGIN;
- 
- 	count_x = box_x - count_rect.x + COUNT_BOX_XPAD;
- 	count_y = box_y - count_rect.y + COUNT_BOX_YPAD;
- 
--	gtk_paint_box(widget->style,
--		      widget->window,
--		      GTK_WIDGET_STATE(widget),
-+	gtk_paint_box(gtk_widget_get_style(widget),
-+		      cr,
-+		      gtk_widget_get_state_flags(widget),
- 		      GTK_SHADOW_OUT,
--		      &event->area,
- 		      widget,
- 		      NULL,
- 		      box_x,
-@@ -564,11 +602,10 @@
- 		      box_width,
- 		      box_height);
- 
--	gtk_paint_layout(widget->style,
--			 widget->window,
--			 GTK_WIDGET_STATE(widget),
-+	gtk_paint_layout(gtk_widget_get_style(widget),
-+			 cr,
-+			 gtk_widget_get_state_flags(widget),
- 			 FALSE,
--			 &event->area,
- 			 widget,
- 			 NULL,
- 			 count_x,
---- build/src/mn-mailbox-properties-dialog.c.orig	2011-02-07 21:57:31.257251776 +0100
-+++ build/src/mn-mailbox-properties-dialog.c	2011-02-07 21:56:56.989854854 +0100
-@@ -456,7 +456,7 @@
-     MNMailboxProperties *properties;
- 
-     mn_container_create_interface(GTK_CONTAINER(self),
--				  PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.glade",
-+				  PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.ui",
- 				  "notebook",
- 				  "mn_mailbox_properties_dialog_",
- 				  "notebook", &self->notebook,
-@@ -1290,7 +1290,7 @@
- {
- #line 686 "src/mn-mailbox-properties-dialog.gob"
- 	
--    if (GTK_WIDGET_IS_SENSITIVE(GTK_WINDOW(self)->default_widget))
-+    if (gtk_widget_is_sensitive(gtk_window_get_default_widget(GTK_WINDOW(self))))
-       gtk_window_activate_default(GTK_WINDOW(self));
-     else
-       {
-@@ -1313,9 +1313,9 @@
- 	    if (elem->data == entry)
- 	      break;
- 
--	    if (GTK_WIDGET_MAPPED(elem->data)
--		&& GTK_WIDGET_VISIBLE(elem->data)
--		&& GTK_WIDGET_SENSITIVE(elem->data))
-+	    if (gtk_widget_get_mapped(elem->data)
-+		&& gtk_widget_get_visible(elem->data)
-+		&& gtk_widget_get_sensitive(elem->data))
- 	      next = elem->data;
- 	  }
- 	while (! next);
---- build/src/mn-mailbox-view.c.orig	2011-02-07 22:18:49.962462920 +0100
-+++ build/src/mn-mailbox-view.c	2011-02-07 23:01:39.990363248 +0100
-@@ -412,23 +412,23 @@
-     binding_set = gtk_binding_set_by_class(class);
- 
-     /* Delete removes a row */
--    gtk_binding_entry_add_signal(binding_set, GDK_Delete, 0, "activate-remove", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_KP_Delete, 0, "activate-remove", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, 0, "activate-remove", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Delete, 0, "activate-remove", 0);
- 
-     /* HIG 2.0 cut/copy/paste shortcuts */
--    gtk_binding_entry_add_signal(binding_set, GDK_x, GDK_CONTROL_MASK, "activate-cut", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_c, GDK_CONTROL_MASK, "activate-copy", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK, "activate-paste", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_x, GDK_CONTROL_MASK, "activate-cut", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_c, GDK_CONTROL_MASK, "activate-copy", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_v, GDK_CONTROL_MASK, "activate-paste", 0);
- 
-     /* cut/copy/paste shortcuts taken from gtkentry.c */
--    gtk_binding_entry_add_signal(binding_set, GDK_Delete, GDK_SHIFT_MASK, "activate-cut", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_CONTROL_MASK, "activate-copy", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_SHIFT_MASK, "activate-paste", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK, "activate-cut", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK, "activate-copy", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK, "activate-paste", 0);
- 
-     /* HIG 2.0 properties */
--    gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_MOD1_MASK, "activate-properties", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Return, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-   
- #line 434 "mn-mailbox-view.c"
-  }
-@@ -934,14 +934,13 @@
- #line 183 "src/mn-mailbox-view.gob"
- 	
-     GtkSelectionData *data;
--
-     data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_MAILBOXES].atom);
-     if (data)
-       {
- 	GSList *configurations;
- 	GSList *l;
- 
--	memcpy(&configurations, data->data, data->length);
-+	memcpy(&configurations, gtk_selection_data_get_data(data), gtk_selection_data_get_length(data));
- 
- 	MN_LIST_FOREACH(l, configurations)
- 	  {
-@@ -962,14 +961,14 @@
-     data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_GNOME_COPIED_FILES].atom);
-     if (data)
-       {
--	if (data->format == 8 && data->length > 0)
-+	if (gtk_selection_data_get_format(data) == 8 && gtk_selection_data_get_length(data) > 0)
- 	  {
- 	    char *gnome_copied_files;
- 	    gboolean status;
- 	    MNGnomeCopiedFilesType type;
- 	    GSList *uri_list;
- 
--	    gnome_copied_files = g_strndup(data->data, data->length);
-+	    gnome_copied_files = g_strndup(gtk_selection_data_get_data(data), gtk_selection_data_get_length(data));
- 	    status = mn_parse_gnome_copied_files(gnome_copied_files, &type, &uri_list);
- 	    g_free(gnome_copied_files);
- 
---- build/src/mn-shell.c.orig	2011-02-07 23:02:17.852293679 +0100
-+++ build/src/mn-shell.c	2011-02-07 23:04:39.223548403 +0100
-@@ -158,7 +158,7 @@
- static void mn_shell_icon_activate_about_h (MNMailIcon * icon, gpointer user_data);
- #line 160 "mn-shell.c"
- #line 499 "src/mn-shell.gob"
--static void mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data);
-+static void mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data);
- #line 163 "mn-shell.c"
- #line 508 "src/mn-shell.gob"
- static void mn_shell_update_sensitivity (MNShell * self);
-@@ -1006,7 +1006,7 @@
- 
- #line 499 "src/mn-shell.gob"
- static void 
--mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data)
-+mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data)
- {
- #line 1004 "mn-shell.c"
- #define __GOB_FUNCTION__ "MN:Shell::icon_destroy_h"
---- build/src/mn-text-table.c.orig	2011-02-07 23:05:08.799927792 +0100
-+++ build/src/mn-text-table.c	2011-02-07 23:18:06.480056895 +0100
-@@ -69,9 +69,11 @@
- #line 70 "mn-text-table.c"
- #line 104 "src/mn-text-table.gob"
- static void ___4_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition);
-+static void mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width);
-+static void mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height);
- #line 73 "mn-text-table.c"
- #line 115 "src/mn-text-table.gob"
--static gboolean ___5_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event);
-+static gboolean ___5_mn_text_table_draw (GtkWidget * widget, cairo_t *cr);
- #line 76 "mn-text-table.c"
- #line 165 "src/mn-text-table.gob"
- static void mn_text_table_set_dirty (MNTextTable * self);
-@@ -188,9 +190,10 @@
- 	parent_class = g_type_class_ref (GTK_TYPE_WIDGET);
- 
- #line 104 "src/mn-text-table.gob"
--	gtk_widget_class->size_request = ___4_mn_text_table_size_request;
-+        gtk_widget_class->get_preferred_width = mn_text_table_get_preferred_width;
-+        gtk_widget_class->get_preferred_height = mn_text_table_get_preferred_height;
- #line 115 "src/mn-text-table.gob"
--	gtk_widget_class->expose_event = ___5_mn_text_table_expose_event;
-+	gtk_widget_class->draw = ___5_mn_text_table_draw;
- #line 257 "src/mn-text-table.gob"
- 	c->clear = ___real_mn_text_table_clear;
- #line 197 "mn-text-table.c"
-@@ -216,7 +219,7 @@
-  {
- #line 80 "src/mn-text-table.gob"
- 
--    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
-+    gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
- 
-     g_object_connect(self,
- 		     "swapped-signal::style-set", self_context_changed, self,
-@@ -290,9 +293,29 @@
- #undef __GOB_FUNCTION__
- #undef PARENT_HANDLER
- 
-+static void
-+mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width)
-+{
-+    GtkRequisition requisition;
-+
-+    ___4_mn_text_table_size_request (widget, &requisition);
-+
-+    *minimal_width = *natural_width = requisition.width;
-+}
-+
-+static void
-+mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height)
-+{
-+    GtkRequisition requisition;
-+
-+    ___4_mn_text_table_size_request (widget, &requisition);
-+
-+    *minimal_height = *natural_height = requisition.height;
-+}
-+
- #line 115 "src/mn-text-table.gob"
- static gboolean 
--___5_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-+___5_mn_text_table_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr)
- #line 297 "mn-text-table.c"
- #define PARENT_HANDLER(___widget,___event) \
- 	((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
-@@ -304,10 +327,14 @@
- #line 117 "src/mn-text-table.gob"
- 	
-     Self *self = SELF(widget);
-+    GtkAllocation allocation;
-     int i;
--    int y = widget->allocation.y;
-+    int y;
-+
-+    gtk_widget_get_allocation(widget, &allocation);
-+    y = 0;
- 
--    if (! GTK_WIDGET_DRAWABLE(widget))
-+    if (! gtk_widget_is_drawable(widget))
-       return FALSE;
- 
-     self_relayout(self);
-@@ -316,7 +343,7 @@
-       {
- 	Row *row = g_ptr_array_index(selfp->rows, i);
- 	int j;
--	int x = widget->allocation.x;
-+	int x = 0;
- 	int column = 0;
- 
- 	MN_ARRAY_FOREACH(j, row->cells)
-@@ -324,11 +351,10 @@
- 	    MNTextTableCell *cell = g_ptr_array_index(row->cells, j);
- 
- 	    if (cell->layout)
--	      gtk_paint_layout(widget->style,
--			       widget->window,
--			       GTK_WIDGET_STATE(widget),
-+	      gtk_paint_layout(gtk_widget_get_style(widget),
-+			       cr,
-+			       gtk_widget_get_state_flags(widget),
- 			       FALSE,
--			       &event->area,
- 			       widget,
- 			       NULL,
- 			       x,
---- build/src/mn-tooltips.c.orig	2011-02-07 23:19:05.903761972 +0100
-+++ build/src/mn-tooltips.c	2011-02-07 23:41:19.368621912 +0100
-@@ -104,7 +104,7 @@
- static void mn_tooltips_set_tip_widget_real (MNTooltips * self, GtkWidget * widget, GtkWidget * tip_widget, int border_width);
- #line 106 "mn-tooltips.c"
- #line 287 "src/mn-tooltips.gob"
--static gboolean mn_tooltips_paint_window (MNTooltips * self);
-+static gboolean mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr);
- #line 109 "mn-tooltips.c"
- #line 308 "src/mn-tooltips.gob"
- static void mn_tooltips_draw_tips (MNTooltips * self);
-@@ -422,7 +422,13 @@
- 	
-     if (! selfp->window)
-       {
-+	GtkStyleContext *ctx;
-+
- 	selfp->window = gtk_window_new(GTK_WINDOW_POPUP);
-+
-+	ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window));
-+	gtk_style_context_add_class(ctx, "tooltip");
-+
- 	self_update_screen(self, TRUE);
- 	gtk_widget_set_app_paintable(selfp->window, TRUE);
- 	gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE);
-@@ -430,7 +430,7 @@
- 	gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width);
- 
- 	g_signal_connect_swapped(selfp->window,
--				 "expose-event",
-+				 "draw",
- 				 G_CALLBACK(self_paint_window),
- 				 self);
- 
-@@ -490,7 +490,7 @@
- 
-     if (selfp->active_data
- 	&& selfp->active_data->widget == widget
--	&& GTK_WIDGET_DRAWABLE(selfp->active_data->widget))
-+	&& gtk_widget_is_drawable(selfp->active_data->widget))
-       {
- 	if (data->tip_widget)
- 	  g_object_unref(data->tip_widget);
-@@ -594,7 +594,7 @@
- 
- #line 287 "src/mn-tooltips.gob"
- static gboolean 
--mn_tooltips_paint_window (MNTooltips * self)
-+mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr)
- {
- #line 600 "mn-tooltips.c"
- #define __GOB_FUNCTION__ "MN:Tooltips::paint_window"
-@@ -608,18 +608,13 @@
- 	
-     GtkRequisition req;
- 
--    gtk_widget_size_request(selfp->window, &req);
--    gtk_paint_flat_box(selfp->window->style,
--		       selfp->window->window,
--		       GTK_STATE_NORMAL,
--		       GTK_SHADOW_OUT,
--		       NULL,
--		       selfp->window,
--		       "tooltip",
--		       0,
--		       0,
--		       req.width,
--		       req.height);
-+    gtk_widget_size_request(GTK_WIDGET(selfp->window), &req);
-+    gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)),
-+                                                       cr,
-+                                                       0,
-+                                                       0,
-+                                                       req.width,
-+                                                       req.height);
- 
-     return FALSE;
-   }}
-@@ -651,10 +650,11 @@
-     gint monitor_num, px, py;
-     GdkRectangle monitor;
-     int screen_width;
-+    GtkAllocation allocation;
- 
-     if (! selfp->window)
-       self_force_window(self);
--    else if (GTK_WIDGET_VISIBLE(selfp->window))
-+    else if (gtk_widget_get_visible(selfp->window))
-       g_get_current_time(&selfp->last_popdown);
- 
-     gtk_widget_ensure_style(selfp->window);
-@@ -670,7 +670,7 @@
- 
-     data = selfp->active_data;
- 
--    child = GTK_BIN(selfp->window)->child;
-+    child = gtk_bin_get_child(GTK_BIN(selfp->window));
-     if (child)
-       gtk_container_remove(GTK_CONTAINER(selfp->window), child);
- 
-@@ -684,14 +684,16 @@
-     w = requisition.width;
-     h = requisition.height;
- 
--    gdk_window_get_origin(widget->window, &x, &y);
--    if (GTK_WIDGET_NO_WINDOW(widget))
-+    gtk_widget_get_allocation(selfp->window, &allocation);
-+
-+    gdk_window_get_origin(gtk_widget_get_window(widget), &x, &y);
-+    if (! gtk_widget_get_has_window(widget))
-       {
--	x += widget->allocation.x;
--	y += widget->allocation.y;
-+	x += allocation.x;
-+	y += allocation.y;
-       }
- 
--    x += widget->allocation.width / 2;
-+    x += allocation.width / 2;
- 
-     if (! keyboard_mode)
-       gdk_window_get_pointer(gdk_screen_get_root_window(screen), &x, NULL, NULL);
-@@ -712,11 +714,11 @@
-     else if (x < monitor.x)
-       x = monitor.x;
- 
--    if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height
-+    if ((y + h + allocation.height + 4) > monitor.y + monitor.height
- 	&& (y - 4) > monitor.y)
-       y = y - h - 4;
-     else
--      y = y + widget->allocation.height + 4;
-+      y = y + allocation.height + 4;
- 
-     /*
-      * The following block is not part of GTK+ and has been added to
-@@ -760,7 +762,7 @@
- 	
-     Self *self = SELF(data);
- 
--    if (selfp->active_data && GTK_WIDGET_DRAWABLE(selfp->active_data->widget))
-+    if (selfp->active_data && gtk_widget_is_drawable(selfp->active_data->widget))
-       self_draw_tips(self);
- 
-     selfp->timeout_id = 0;
-@@ -785,7 +787,7 @@
- 	
-     if (selfp->window)
-       {
--	if (GTK_WIDGET_VISIBLE(selfp->window))
-+	if (gtk_widget_get_visible(selfp->window))
- 	  g_get_current_time(&selfp->last_popdown);
- 	gtk_widget_hide(selfp->window);
-       }
-@@ -802,7 +804,7 @@
- 	{
- 	  TooltipsData *data = l->data;
- 
--	  if (data->widget == widget && GTK_WIDGET_DRAWABLE(widget))
-+	  if (data->widget == widget && gtk_widget_is_drawable(widget))
- 	    {
- 	      selfp->active_data = data;
- 	      break;
-@@ -937,7 +939,7 @@
- 
-     if (GTK_IS_WINDOW(toplevel))
-       {
--	GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget;
-+	GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel));
- 
- 	g_object_set_data(G_OBJECT(toplevel), TOOLTIPS_KEYBOARD_MODE, GINT_TO_POINTER(TRUE));
- 
-@@ -966,7 +968,7 @@
- 
-     if (GTK_IS_WINDOW(toplevel))
-       {
--	GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget;
-+	GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel));
- 
- 	if (focus)
- 	  self_hide_tip(focus);
-@@ -1057,24 +1059,24 @@
- 	    break;
- 
- 	  case GDK_ENTER_NOTIFY:
--	    if (! (GTK_IS_MENU_ITEM(widget) && GTK_MENU_ITEM(widget)->submenu))
-+	    if (! (GTK_IS_MENU_ITEM(widget) && gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget))))
- 	      self_start_delay(self, widget);
- 	    break;
- 
- 	  case GDK_LEAVE_NOTIFY:
- 	    self_set_active_widget(self, NULL);
--	    selfp->use_sticky_delay = selfp->window && GTK_WIDGET_VISIBLE(selfp->window);
-+	    selfp->use_sticky_delay = selfp->window && gtk_widget_get_visible(selfp->window);
- 	    break;
- 
- 	  case GDK_MOTION_NOTIFY:
- 	    /* Handle menu items specially ... pend popup for each motion
- 	     * on other widgets, we ignore motion.
- 	     */
--	    if (GTK_IS_MENU_ITEM(widget) && ! GTK_MENU_ITEM(widget)->submenu)
-+	    if (GTK_IS_MENU_ITEM(widget) && ! gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)))
- 	      {
- 		/* Completely evil hack to make sure we get the LEAVE_NOTIFY
- 		 */
--		GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING);
-+		//GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING);
- 		self_set_active_widget(self, NULL);
- 		self_start_delay(self, widget);
- 		break;
---- src/nautilus-cell-renderer-pixbuf-emblem.c.orig	2011-02-08 00:16:43.847831409 +0100
-+++ src/nautilus-cell-renderer-pixbuf-emblem.c	2011-02-08 00:32:59.128682767 +0100
-@@ -39,17 +39,16 @@
-                                                           GtkWidget             *widget);
- static void nautilus_cell_renderer_pixbuf_emblem_get_size   (GtkCellRenderer            *cell,
-                                                  GtkWidget                  *widget,
--                                                 GdkRectangle               *rectangle,
-+                                                 const GdkRectangle               *rectangle,
-                                                  gint                       *x_offset,
-                                                  gint                       *y_offset,
-                                                  gint                       *width,
-                                                  gint                       *height);
- static void     nautilus_cell_renderer_pixbuf_emblem_render     (GtkCellRenderer            *cell,
--                                                          GdkWindow                  *window,
-+                                                          cairo_t                    *cr,
-                                                           GtkWidget                  *widget,
--                                                          GdkRectangle               *background_area,
--                                                          GdkRectangle               *cell_area,
--                                                          GdkRectangle               *expose_area,
-+                                                          const GdkRectangle               *background_area,
-+                                                          const GdkRectangle               *cell_area,
-                                                           GtkCellRendererState                       flags);
- 
- enum {
-@@ -356,7 +355,7 @@
- static void
- nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell,
- 				   GtkWidget       *widget,
--				   GdkRectangle    *cell_area,
-+				   const GdkRectangle    *cell_area,
- 				   gint            *x_offset,
- 				   gint            *y_offset,
- 				   gint            *width,
-@@ -368,6 +367,10 @@
- 	gint pixbuf_height = 0;
- 	gint calc_width;
- 	gint calc_height;
-+	int xpad;
-+	int ypad;
-+	gfloat xalign;
-+	gfloat yalign;
- 
- 	if (!cellpixbuf->pixbuf && cellinfo->stock_id)
- 		nautilus_cell_renderer_pixbuf_emblem_create_stock_pixbuf (cellpixbuf, widget);
-@@ -385,8 +388,11 @@
- 		pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed));
- 	}
- 
--	calc_width  = (gint) cell->xpad * 2 + pixbuf_width;
--	calc_height = (gint) cell->ypad * 2 + pixbuf_height;
-+	gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-+	gtk_cell_renderer_get_alignment(cell, &xalign, &yalign);
-+
-+	calc_width  = (gint) xpad * 2 + pixbuf_width;
-+	calc_height = (gint) ypad * 2 + pixbuf_height;
- 
- 	if (x_offset) *x_offset = 0;
- 	if (y_offset) *y_offset = 0;
-@@ -394,14 +400,14 @@
- 	if (cell_area && pixbuf_width > 0 && pixbuf_height > 0) {
- 		if (x_offset) {
- 			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
--				1.0 - cell->xalign : cell->xalign) *
--				(cell_area->width - calc_width - 2 * cell->xpad));
--			*x_offset = MAX (*x_offset, 0) + cell->xpad;
-+				1.0 - xalign : xalign) *
-+				(cell_area->width - calc_width - 2 * xpad));
-+			*x_offset = MAX (*x_offset, 0) + xpad;
- 		}
- 		if (y_offset) {
--			*y_offset = (cell->yalign *
--				(cell_area->height - calc_height - 2 * cell->ypad));
--			*y_offset = MAX (*y_offset, 0) + cell->ypad;
-+			*y_offset = (yalign *
-+				(cell_area->height - calc_height - 2 * ypad));
-+			*y_offset = MAX (*y_offset, 0) + ypad;
- 		}
- 	}
- 
-@@ -414,11 +420,10 @@
- 
- static void
- nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer      *cell,
--                                 GdkWindow            *window,
-+                                 cairo_t              *cr,
-                                  GtkWidget            *widget,
--                                 GdkRectangle         *background_area,
--                                 GdkRectangle         *cell_area,
--                                 GdkRectangle         *expose_area,
-+                                 const GdkRectangle   *background_area,
-+                                 const GdkRectangle   *cell_area,
-                                  GtkCellRendererState  flags)
- 
- {
-@@ -429,13 +434,19 @@
- 	GdkRectangle pix_emblem_rect;
- 	GdkRectangle draw_rect;
- 	gboolean stock_pixbuf = FALSE;
-+	gboolean is_expander = FALSE;
-+	gboolean is_expanded = FALSE;
-+	int xpad;
-+	int ypad;
-+
-+	g_object_get(cell, "is-expander", &is_expander, "is-expanded", &is_expanded, NULL);
- 
- 	pixbuf = cellpixbuf->pixbuf;
--	if (cell->is_expander) {
--		if (cell->is_expanded &&
-+	if (is_expander) {
-+		if (is_expanded &&
- 		    cellpixbuf->pixbuf_expander_open != NULL) {
- 			pixbuf = cellpixbuf->pixbuf_expander_open;
--		} else if (!cell->is_expanded &&
-+		} else if (!is_expanded &&
- 			   cellpixbuf->pixbuf_expander_closed != NULL) {
- 			pixbuf = cellpixbuf->pixbuf_expander_closed;
- 		}
-@@ -456,15 +467,20 @@
- 	if (stock_pixbuf)
- 		pixbuf = cellpixbuf->pixbuf;
- 
-+	gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-+
- 	pix_rect.x += cell_area->x;
- 	pix_rect.y += cell_area->y;
--	pix_rect.width  -= cell->xpad * 2;
--	pix_rect.height -= cell->ypad * 2;
-+	pix_rect.width  -= xpad * 2;
-+	pix_rect.height -= ypad * 2;
- 
-+	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) {
-+#if 0
- 	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) &&
- 	    gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) {
-+
- 		gdk_draw_pixbuf (window,
--			widget->style->black_gc,
-+			gtk_widget_get_style(widget)->black_gc,
- 			pixbuf,
- 			/* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
- 			draw_rect.x - pix_rect.x,
-@@ -475,6 +491,11 @@
- 			draw_rect.height,
- 			GDK_RGB_DITHER_NORMAL,
- 			0, 0);
-+#endif
-+
-+		cairo_move_to (cr, draw_rect.x - pix_rect.x, draw_rect.y - pix_rect.y);
-+		gdk_cairo_set_source_pixbuf (cr, pixbuf, draw_rect.x, draw_rect.y);
-+		cairo_paint (cr);
- 	}
- 
- 	if (cellpixbuf->pixbuf_emblem) {
-@@ -482,8 +503,11 @@
- 		pix_emblem_rect.height = gdk_pixbuf_get_height (cellpixbuf->pixbuf_emblem);
- 		pix_emblem_rect.x = pix_rect.x;
- 		pix_emblem_rect.y = pix_rect.y + pix_rect.height - pix_emblem_rect.height;
-+		if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect)) {
-+#if 0
- 		if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect) &&
- 		    gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) {
-+
- 			gdk_draw_pixbuf (window,
- 				widget->style->black_gc,
- 				cellpixbuf->pixbuf_emblem,
-@@ -496,6 +520,11 @@
- 				draw_rect.height,
- 				GDK_RGB_DITHER_NORMAL,
- 				0, 0);
-+#endif
-+
-+			cairo_move_to (cr, draw_rect.x - pix_emblem_rect.x, draw_rect.y - pix_emblem_rect.y);
-+			gdk_cairo_set_source_pixbuf (cr, cellpixbuf->pixbuf_emblem, draw_rect.x, draw_rect.y);
-+			cairo_paint (cr);
- 		}
- 	}
- }
---- src/nautilus-cell-renderer-pixbuf-emblem.h.orig	2011-02-07 22:18:12.336471764 +0100
-+++ src/nautilus-cell-renderer-pixbuf-emblem.h	2011-02-08 00:20:30.461758697 +0100
-@@ -25,18 +25,18 @@
- #ifndef NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
- 
--#include <gtk/gtkcellrenderer.h>
-+#include <gtk/gtk.h>
- 
- #define NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM \
- 	(nautilus_cell_renderer_pixbuf_emblem_get_type ())
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
--	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem))
-+	(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem))
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
--	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass))
-+	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass))
- #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
--	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
- #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
--	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-+	(G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
- 
- typedef struct _NautilusCellRendererPixbufEmblem NautilusCellRendererPixbufEmblem;
- typedef struct _NautilusCellRendererPixbufEmblemClass NautilusCellRendererPixbufEmblemClass;
---- build/src/mn-authenticated-mailbox.c.orig	2011-02-08 00:34:16.332610802 +0100
-+++ build/src/mn-authenticated-mailbox.c	2011-02-08 00:36:23.706936717 +0100
-@@ -25,7 +25,7 @@
- #line 29 "src/mn-authenticated-mailbox.gob"
- 
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-mailbox-private.h"
- #include "mn-shell.h"
- #include "mn-util.h"
-@@ -859,6 +859,7 @@
- 
-     /* keep the title in sync with gnome-authentication-manager */
- 
-+#if 0
-     /* translators: header capitalization */
-     selfp->auth_dialog = gnome_password_dialog_new(_("Authentication Required"),
- 						   message,
-@@ -891,6 +892,9 @@
-     gtk_widget_destroy(selfp->auth_dialog);
- 
-     return ok;
-+#else
-+    return FALSE;
-+#endif
-   }}
- #line 896 "mn-authenticated-mailbox.c"
- #undef __GOB_FUNCTION__
---- build/src/mn-about-dialog.c.orig	2011-02-08 22:20:54.469841262 +0100
-+++ build/src/mn-about-dialog.c	2011-02-08 22:21:13.309839037 +0100
-@@ -111,9 +111,11 @@
-  {
- #line 32 "src/mn-about-dialog.gob"
- 
-+#if 0
-     gtk_about_dialog_set_email_hook(self_activate_link_cb, "mailto:", NULL);
-     gtk_about_dialog_set_url_hook(self_activate_link_cb, NULL, NULL);
--  
-+#endif
-+
- #line 118 "mn-about-dialog.c"
-  }
- }
---- build/src/mn-autodetect-mailbox-properties.c.orig	2011-02-08 22:21:58.639427345 +0100
-+++ build/src/mn-autodetect-mailbox-properties.c	2011-02-08 22:22:43.564035901 +0100
-@@ -355,10 +355,9 @@
- 
-     toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button));
-     /* translators: header capitalization */
--    selfp->chooser = gtk_file_chooser_dialog_new_with_backend(_("Select a File or Folder"),
-+    selfp->chooser = gtk_file_chooser_dialog_new(_("Select a File or Folder"),
- 							      GTK_WINDOW(toplevel),
- 							      GTK_FILE_CHOOSER_ACTION_OPEN,
--							      "gnome-vfs",
- 							      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- 							      GTK_STOCK_OPEN, 1,
- 							      NULL);
---- build/src/mn-pi-mailbox-properties.c.orig	2011-02-08 22:30:08.051375715 +0100
-+++ build/src/mn-pi-mailbox-properties.c	2011-02-08 22:30:21.398665261 +0100
-@@ -415,7 +415,7 @@
-     int i;
- 
-     for (i = 0; i < MN_PI_MAILBOX_N_CONNECTION_TYPES; i++)
--      gtk_widget_set_sensitive(self->port_spin[i], GTK_WIDGET_SENSITIVE(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i])));
-+      gtk_widget_set_sensitive(self->port_spin[i], gtk_widget_get_sensitive(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i])));
- 
-     g_object_notify(G_OBJECT(self), "complete");
-   }}
---- src/eggtrayicon.c.orig	2011-02-07 23:42:30.405791829 +0100
-+++ src/eggtrayicon.c	2011-02-08 23:06:16.092968325 +0100
-@@ -25,7 +25,7 @@
- 
- #include "eggtrayicon.h"
- 
--#include <gdkconfig.h>
-+#include <gdk/gdk.h>
- #if defined (GDK_WINDOWING_X11)
- #include <gdk/gdkx.h>
- #include <X11/Xatom.h>
-@@ -258,7 +258,7 @@
-     {
-       GdkWindow *gdkwin;
- 
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-+      gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (widget),
-                                               icon->manager_window);
- 
-       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-@@ -290,7 +290,7 @@
-   ev.window = window;
-   ev.message_type = icon->system_tray_opcode_atom;
-   ev.format = 32;
--  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-+  ev.data.l[0] = gdk_x11_get_server_time (gtk_widget_get_window(GTK_WIDGET (icon)));
-   ev.data.l[1] = message;
-   ev.data.l[2] = data1;
-   ev.data.l[3] = data2;
-@@ -342,12 +342,12 @@
-     {
-       GdkWindow *gdkwin;
- 
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+      gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					      icon->manager_window);
- 
-       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
- 
--      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-+      if (dock_if_realized && gtk_widget_get_realized (GTK_WIDGET(icon)))
- 	egg_tray_icon_send_dock_request (icon);
- 
-       egg_tray_icon_get_orientation_property (icon);
-@@ -355,10 +355,16 @@
- }
- 
- static gboolean
--transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-+transparent_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data)
- {
--  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-+#if 0
-+  gdk_window_clear_area (gtk_widget_get_window(widget), event->area.x, event->area.y,
- 			 event->area.width, event->area.height);
-+#endif
-+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-+  //gdk_cairo_region (cr, event->region);
-+  cairo_fill (cr);
-+
-   return FALSE;
- }
- 
-@@ -366,20 +372,20 @@
- make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
- 			gpointer user_data)
- {
--  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+  //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE);
- }
- 
- static void
- make_transparent (GtkWidget *widget, gpointer user_data)
- {
--  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+  if (! gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget))
-     return;
- 
-   gtk_widget_set_app_paintable (widget, TRUE);
-   gtk_widget_set_double_buffered (widget, FALSE);
--  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
--  g_signal_connect (widget, "expose_event",
--		    G_CALLBACK (transparent_expose_event), NULL);
-+  //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE);
-+  g_signal_connect (widget, "draw",
-+		    G_CALLBACK (transparent_draw), NULL);
-   g_signal_connect_after (widget, "style_set",
- 			  G_CALLBACK (make_transparent_again), NULL);
- }
-@@ -391,7 +397,7 @@
- 
-   g_return_if_fail (icon->manager_window != None);
- 
--  gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+  gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					  icon->manager_window);
- 
-   gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
---- build/src/mn-properties-dialog.c.orig	2011-02-08 23:37:12.605200174 +0100
-+++ build/src/mn-properties-dialog.c	2011-02-08 23:37:18.601881191 +0100
-@@ -183,7 +183,7 @@
-     GtkTreeSelection *selection;
- 
-     mn_container_create_interface(GTK_CONTAINER(self),
--				  PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.glade",
-+				  PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.ui",
- 				  "main_vbox",
- 				  "mn_properties_dialog_",
- 				  "notebook", &selfp->notebook,
---- src/mn-util.c.orig	2011-02-08 00:01:25.167207512 +0100
-+++ src/mn-util.c	2011-02-09 00:01:35.718285446 +0100
-@@ -26,8 +26,7 @@
- #include <gmodule.h>
- #include <glib/gi18n.h>
- #include <gobject/gvaluecollector.h>
--#include <gnome.h>
--#include <glade/glade.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- #include "mn-mailboxes.h"
- #include "mn-shell.h"
-@@ -303,49 +302,55 @@
-   return pixbuf;
- }
- 
--static GladeXML *
-+static GtkBuilder *
- mn_glade_xml_new (const char *filename, const char *root, const char *domain)
- {
--  GladeXML *xml;
-+  GtkBuilder *builder;
-+  GError *err = NULL;
- 
-   g_return_val_if_fail(filename != NULL, NULL);
- 
--  xml = glade_xml_new(filename, root, domain);
--  if (! xml)
--    mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\".", filename);
-+  builder = gtk_builder_new();
-+  gtk_builder_set_translation_domain(builder, domain);
-+  if (! gtk_builder_add_from_file(builder, filename, &err)) {
-+    mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\": %s.", filename, err->message);
-+    g_error_free(err);
-+    g_object_unref(builder);
-+    return NULL;
-+  }
- 
--  return xml;
-+  return builder;
- }
- 
- static GtkWidget *
--mn_glade_xml_get_widget (GladeXML *xml, const char *widget_name)
-+mn_glade_xml_get_widget (GtkBuilder *builder, const char *widget_name)
- {
-   GtkWidget *widget;
- 
--  g_return_val_if_fail(GLADE_IS_XML(xml), NULL);
-+  g_return_val_if_fail(GTK_IS_BUILDER(builder), NULL);
-   g_return_val_if_fail(widget_name != NULL, NULL);
- 
--  widget = glade_xml_get_widget(xml, widget_name);
-+  widget = GTK_WIDGET(gtk_builder_get_object(builder, widget_name));
-   if (! widget)
--    mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface \"%s\".", widget_name, xml->filename);
-+    mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface.", widget_name);
- 
-   return widget;
- }
- 
- static void
--create_interface_connect_cb (const char *handler_name,
-+create_interface_connect_cb (GtkBuilder *builder,
- 			     GObject *object,
- 			     const char *signal_name,
--			     const char *signal_data,
-+			     const char *handler_name,
- 			     GObject *connect_object,
--			     gboolean after,
-+                             GConnectFlags flags,
- 			     gpointer user_data)
- {
-   static GModule *module = NULL;
-   ContainerCreateInterfaceConnectInfo *info = user_data;
-   char *cb_name;
-   GCallback cb;
--  GConnectFlags flags;
-+  GConnectFlags cflags;
- 
-   if (! module)
-     {
-@@ -359,11 +364,9 @@
-     mn_show_fatal_error_dialog(NULL, "Signal handler \"%s\" not found.", cb_name);
-   g_free(cb_name);
- 
--  flags = G_CONNECT_SWAPPED;
--  if (after)
--    flags |= G_CONNECT_AFTER;
-+  cflags = G_CONNECT_SWAPPED;
- 
--  g_signal_connect_data(object, signal_name, cb, info->container, NULL, flags);
-+  g_signal_connect_data(object, signal_name, cb, info->container, NULL, cflags);
- }
- 
- void
-@@ -373,7 +376,7 @@
- 			       const char *callback_prefix,
- 			       ...)
- {
--  GladeXML *xml;
-+  GtkBuilder *xml;
-   GtkWidget *child;
-   ContainerCreateInterfaceConnectInfo info;
-   va_list args;
-@@ -387,14 +390,16 @@
-   xml = mn_glade_xml_new(filename, child_name, NULL);
-   child = mn_glade_xml_get_widget(xml, child_name);
- 
--  if (GTK_IS_DIALOG(container))
--    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(container)->vbox), child, TRUE, TRUE, 0);
--  else
-+  if (GTK_IS_DIALOG(container)) {
-+    gtk_widget_unparent(child);
-+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(container))), child, TRUE, TRUE, 0);
-+  } else {
-     gtk_container_add(container, child);
-+  }
- 
-   info.container = container;
-   info.callback_prefix = callback_prefix;
--  glade_xml_signal_autoconnect_full(xml, create_interface_connect_cb, &info);
-+  gtk_builder_connect_signals_full(xml, create_interface_connect_cb, &info);
- 
-   va_start(args, callback_prefix);
- 
-@@ -422,7 +427,7 @@
- 
-   toplevel = gtk_widget_get_toplevel(widget);
- 
--  return GTK_WIDGET_TOPLEVEL(toplevel) ? GTK_WINDOW(toplevel) : NULL;
-+  return gtk_widget_get_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL;
- }
- 
- static void
-@@ -493,9 +498,11 @@
- 			       gpointer user_data)
- {
-   GtkAdjustment *adjustment;
-+  GtkAllocation allocation;
- 
-+  gtk_widget_get_allocation(widget, &allocation);
-   adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(widget));
--  gtk_adjustment_set_value(adjustment, (double) y / (widget->allocation.height - 2) * (adjustment->upper - adjustment->page_size));
-+  gtk_adjustment_set_value(adjustment, (double) y / (allocation.height - 2) * (gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment)));
- 
-   return TRUE;			/* we're forcibly in a drop zone */
- }
-@@ -562,7 +569,7 @@
- 	MNMailbox *mailbox;
- 
- 	/* text/x-moz-url is encoded in UCS-2 but in format 8: broken */
--	if (selection_data->format != 8 || selection_data->length <= 0 || (selection_data->length % 2) != 0)
-+	if (gtk_selection_data_get_format(selection_data) != 8 || gtk_selection_data_get_length(selection_data) <= 0 || (gtk_selection_data_get_length(selection_data) % 2) != 0)
- 	  {
- 	    mn_show_error_dialog(mn_widget_get_parent_window(widget),
- 				 _("A drag and drop error has occurred"),
-@@ -570,8 +577,8 @@
- 	    return;
- 	  }
- 
--	char_data = (const guint16 *) selection_data->data;
--	char_len = selection_data->length / 2;
-+	char_data = (const guint16 *) gtk_selection_data_get_data(selection_data);
-+	char_len = gtk_selection_data_get_length(selection_data) / 2;
- 
- 	url = g_string_new(NULL);
- 	for (i = 0; i < char_len && char_data[i] != '\n'; i++)
-@@ -1322,7 +1329,7 @@
- }
- 
- static void
--dialog_run_nonmodal_destroy_h (GtkObject *object, gpointer user_data)
-+dialog_run_nonmodal_destroy_h (GtkWidget *object, gpointer user_data)
- {
-   RunNonmodalInfo *info = user_data;
- 
-@@ -1375,7 +1382,7 @@
- 
-   g_object_ref(dialog);
- 
--  if (! GTK_WIDGET_VISIBLE(dialog))
-+  if (! gtk_widget_get_visible(dialog))
-     gtk_widget_show(GTK_WIDGET(dialog));
- 
-   g_object_connect(dialog,
---- src/mn-main.c.gtk3	2008-05-22 17:45:35.000000000 +0200
-+++ src/mn-main.c	2011-02-08 23:32:33.800030659 +0100
-@@ -21,7 +21,7 @@
- #include <stdlib.h>
- #include <signal.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include <libnotify/notify.h>
- #include <dbus/dbus-glib-lowlevel.h>
-@@ -452,7 +452,7 @@
- 
-   gnome_program_init(PACKAGE,
- 		     VERSION,
--		     LIBGNOMEUI_MODULE,
-+		     LIBGNOME_MODULE,
- 		     argc,
- 		     argv,
- 		     GNOME_PARAM_HUMAN_READABLE_NAME, _("Mail Notification"),
-@@ -460,6 +460,8 @@
- 		     GNOME_PARAM_GOPTION_CONTEXT, option_context,
- 		     NULL);
- 
-+  gtk_init(&argc, &argv);
-+
-   if (arg_version)
-     {
-       print_version();
-@@ -497,7 +499,9 @@
- 	  if (! gnome_vfs_init())
- 	    mn_show_fatal_error_dialog(NULL, _("Unable to initialize the GnomeVFS library."));
- 
-+#if 0
- 	  gnome_authentication_manager_init();
-+#endif
- 
- 	  /* must be called before init_gmime() */
- 	  mn_conf_init();
---- src/mn-conf.c.gtk3	2008-05-22 17:45:35.000000000 +0200
-+++ src/mn-conf.c	2011-02-07 20:07:01.630580132 +0100
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdarg.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- #include "mn-conf.h"
- #include "mn-shell.h"
---- data/mail-notification.desktop.in.orig	2011-07-08 13:46:52.327548264 +0200
-+++ data/mail-notification.desktop.in	2011-07-08 13:47:00.732704467 +0200
-@@ -5,7 +5,7 @@
- _Comment=Get notified when new mail arrives
- Type=Application
- Categories=GNOME;GTK;Network;Email;
--Exec=mail-notification --sm-disable
-+Exec=mail-notification
- Terminal=false
- StartupNotify=true
- X-GNOME-DocPath=mail-notification/mail-notification.xml
diff --git a/staging/mail-notification/mail-notification-5.4-icons.patch b/staging/mail-notification/mail-notification-5.4-icons.patch
deleted file mode 100644
index 48d54742a..000000000
--- a/staging/mail-notification/mail-notification-5.4-icons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c
---- mail-notification-5.4/src/mn-stock.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-stock.c	2010-05-24 19:36:03.000000000 +0400
-@@ -32,11 +32,11 @@
-     const char	*icon_name;
-     const char	*source_stock_id;
-   } icons[] = {
--    { MN_STOCK_MAIL,			NULL, "stock_mail" },
--    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
--    { MN_STOCK_LOCAL,			NULL, "stock_folder" },
--    { MN_STOCK_REMOTE,			NULL, "stock_internet" },
--    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
-+    { MN_STOCK_MAIL,			NULL, "mail-message-new" },
-+    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
-+    { MN_STOCK_LOCAL,			NULL, "folder" },
-+    { MN_STOCK_REMOTE,			NULL, "applications-internet" },
-+    { MN_STOCK_UNKNOWN,			NULL, "dialog-question" },
-     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
- #if WITH_GMAIL
-     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
-@@ -48,14 +48,14 @@
-     { MN_STOCK_HOTMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
- #endif
- #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
--    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
-+    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
- #endif
- #if WITH_EVOLUTION
-     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
- #endif
--    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
--    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
--    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
-+    { MN_STOCK_MAIL_READER,		NULL, "mail-unread" },
-+    { MN_STOCK_OPEN_MESSAGE,		NULL, "mail-read" },
-+    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
-   };
-   GtkIconFactory *factory;
-   GtkIconTheme *icon_theme;
diff --git a/staging/mail-notification/mail-notification-5.4-kde-trayicon.patch b/staging/mail-notification/mail-notification-5.4-kde-trayicon.patch
deleted file mode 100644
index a3bdc8372..000000000
--- a/staging/mail-notification/mail-notification-5.4-kde-trayicon.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
---- mail-notification-5.4/build/src/mn-shell.c	2010-10-11 17:45:23.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-10-11 17:45:48.000000000 +0400
-@@ -313,6 +313,29 @@
- #undef __GOB_FUNCTION__
- 
- static void 
-+mn_shell_init_icon_base (MNShell * self)
-+{
-+    g_return_if_fail (self != NULL);
-+    g_return_if_fail (MN_IS_SHELL (self));
-+
-+    self->icon = MN_MAIL_ICON(mn_mail_icon_new());
-+    mn_add_weak_pointer(&self->icon);
-+
-+    g_object_connect(self->icon,
-+                     "signal::activate", self_icon_activate_h, self,
-+                     "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self,
-+                     "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self,
-+                     "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self,
-+                     "swapped-signal::activate-update", self_update, self,
-+                     "signal::activate-properties", self_icon_activate_properties_h, self,
-+                     "signal::activate-help", self_icon_activate_help_h, self,
-+                     "signal::activate-about", self_icon_activate_about_h, self,
-+                     "swapped-signal::activate-remove", self_quit, self,
-+                     "signal::destroy", self_icon_destroy_h, self,
-+                     NULL);
-+}
-+
-+static void 
- mn_shell_init (MNShell * o G_GNUC_UNUSED)
- {
- #define __GOB_FUNCTION__ "MN:Shell::init"
-@@ -793,22 +816,7 @@
- {
- #line 360 "src/mn-shell.gob"
- 	
--    self->icon = MN_MAIL_ICON(mn_mail_icon_new());
--    mn_add_weak_pointer(&self->icon);
--
--    g_object_connect(self->icon,
--		     "signal::activate", self_icon_activate_h, self,
--		     "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self,
--		     "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self,
--		     "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self,
--		     "swapped-signal::activate-update", self_update, self,
--		     "signal::activate-properties", self_icon_activate_properties_h, self,
--		     "signal::activate-help", self_icon_activate_help_h, self,
--		     "signal::activate-about", self_icon_activate_about_h, self,
--		     "swapped-signal::activate-remove", self_quit, self,
--		     "signal::destroy", self_icon_destroy_h, self,
--		     NULL);
--
-+    mn_shell_init_icon_base(self);
-     self_update_sensitivity(self);
-     self_update_tooltip(self);
-     self_update_icon(self);
-@@ -1094,7 +1102,13 @@
-       }
-     else
-       {
--	gtk_widget_hide(GTK_WIDGET(self->icon));
-+	/* Re-create the icon as a regular gtk_widget_hide causes the
-+	 * icon to remain visible on non-GNOME environments. We can't
-+	 * use the callback self_icon_destroy_h here as it can cause an
-+	 * endless recursion */
-+	g_signal_handlers_disconnect_by_func(self->icon, self_icon_destroy_h, self);
-+	gtk_widget_destroy(GTK_WIDGET(self->icon));
-+	mn_shell_init_icon_base(self);
- 	mn_mail_icon_set_blinking(self->icon, FALSE);
-       }
-   }}
diff --git a/staging/mail-notification/mail-notification-5.4-libx11.patch b/staging/mail-notification/mail-notification-5.4-libx11.patch
deleted file mode 100644
index bb3574fda..000000000
--- a/staging/mail-notification/mail-notification-5.4-libx11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Link with libX11 explicitly.
-
---- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c
-+++ mail-notification-5.4.dfsg.1/jbsrc/jb.c
-@@ -445,6 +445,8 @@
- 
-   jb_compile_options_add_libs(object->compile_options, "-lm");
- 
-+  jb_compile_options_add_libs(object->compile_options, "-lX11");
-+
-   jb_compile_options_add_package(object->compile_options, "gettext");
-   jb_compile_options_add_package(object->compile_options, "gnome");
-   jb_compile_options_add_package(object->compile_options, "dbus");
diff --git a/staging/mail-notification/mail-notification-5.4-popup-attach.patch b/staging/mail-notification/mail-notification-5.4-popup-attach.patch
deleted file mode 100644
index b8d5f6a09..000000000
--- a/staging/mail-notification/mail-notification-5.4-popup-attach.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-popup.c mail-notification-5.4-OK/build/src/mn-popup.c
---- mail-notification-5.4/build/src/mn-popup.c	2008-05-22 19:47:49.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-popup.c	2010-10-11 17:42:32.000000000 +0400
-@@ -177,6 +177,29 @@
- #undef __GOB_FUNCTION__
- 
- static void 
-+mn_popup_wait_for_icon_to_become_ready (void)
-+{
-+    int x, y;
-+    int count = 0;
-+
-+    /* When the tray icon is created, it can still take some time before
-+     * it has arrived at the correct position. This is especially the case
-+     * on KDE environments. To work around this, add a little delay of at
-+     * most 2 seconds before showing a popup which is attached to the notification */
-+    do {
-+        gdk_window_get_origin (gtk_widget_get_window (mn_shell->icon), &x, &y);
-+
-+        if (x != 0 || y != 0) {
-+            break;
-+        }
-+
-+        g_usleep(G_USEC_PER_SEC / 10);
-+        count++;
-+    } while (count < 20);
-+}
-+
-+
-+static void 
- mn_popup_init (MNPopup * o G_GNUC_UNUSED)
- {
- #define __GOB_FUNCTION__ "MN:Popup::init"
-@@ -299,8 +322,10 @@
- 		 "icon-name", "stock_mail",
- 		 NULL);
- 
--    if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED)
-+    if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) {
-+      mn_popup_wait_for_icon_to_become_ready();
-       g_object_set(self, "attach-widget", mn_shell->icon, NULL);
-+    }
- 
-     g_string_free(body, TRUE);
- 
diff --git a/staging/mail-notification/mail-notification-5.4-sasl_encode64.patch b/staging/mail-notification/mail-notification-5.4-sasl_encode64.patch
deleted file mode 100644
index 80a7304d1..000000000
--- a/staging/mail-notification/mail-notification-5.4-sasl_encode64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c
---- mail-notification-5.4/build/src/mn-pop3-mailbox.c	2009-05-19 10:29:58.448201837 +0200
-+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c	2009-05-19 10:23:29.356204287 +0200
-@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS
- 
- 	if (initial_clientoutlen > 0)
- 	  {
--	    char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */
-+	    char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
- 	    unsigned int outlen;
- 	    int result;
- 	    char *str;
-diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c
---- mail-notification-5.4/src/mn-client-session.c	2008-05-22 17:45:35.000000000 +0200
-+++ mail-notification-5.4-OK/src/mn-client-session.c	2009-05-19 10:29:09.112211055 +0200
-@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession
- static int
- write_base64 (MNClientSession *session, const char *buf, unsigned int len)
- {
--  char buf64[len * 2];		/* Base64 is 33% larger than the data it encodes */
-+  char buf64[len * 2 + 1];		/* Base64 is 33% larger than the data it encodes */
-   unsigned int outlen;
-   int result;
-   char *str;
diff --git a/staging/mail-notification/mail-notification-5.4-weak.patch b/staging/mail-notification/mail-notification-5.4-weak.patch
deleted file mode 100644
index 2e2a233aa..000000000
--- a/staging/mail-notification/mail-notification-5.4-weak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
---- mail-notification-5.4/build/src/mn-shell.c	2008-05-22 19:47:49.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-05-24 19:39:48.000000000 +0400
-@@ -1008,6 +1008,7 @@
-     Self *self = user_data;
- 
-     /* The Notification Area applet has been terminated. Recreate the icon. */
-+    mn_remove_weak_pointer(&self->icon);
-     self_init_icon(self);
-   }}
- #line 1014 "mn-shell.c"
diff --git a/staging/mail-notification/mail-notification.install b/staging/mail-notification/mail-notification.install
deleted file mode 100644
index 21cd94399..000000000
--- a/staging/mail-notification/mail-notification.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=mail-notification
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1
-  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() {
-  kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/mail-notification/remove-ubuntu-special-case.patch b/staging/mail-notification/remove-ubuntu-special-case.patch
deleted file mode 100644
index 4516f32c6..000000000
--- a/staging/mail-notification/remove-ubuntu-special-case.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
-+++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
-@@ -164,8 +164,6 @@
- static void
- gconf_configure (void)
- {
--  JBVariable *variable;
--
-   jb_require_program("gconftool-2");
- 
-   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
-@@ -178,21 +176,6 @@
-       jb_variable_set_string("gconf-config-source", config_source);
-       g_free(config_source);
-     }
--
--  /* fix the default schemas dir on Ubuntu */
--  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
--  if (! variable->user_set)
--    {
--      static const char *ubuntu_dir = "$datadir/gconf/schemas";
--      char *expanded;
--
--      expanded = jb_variable_expand(ubuntu_dir, NULL);
--
--      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
--	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
--
--      g_free(expanded);
--    }
- }
- 
- static void
diff --git a/staging/metacity/PKGBUILD b/staging/metacity/PKGBUILD
deleted file mode 100644
index fcd149581..000000000
--- a/staging/metacity/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147952 2012-01-29 03:06:23Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=metacity
-pkgver=2.34.1
-pkgrel=2
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
-makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/metacity/metacity.install b/staging/metacity/metacity.install
deleted file mode 100644
index 2eb1e5094..000000000
--- a/staging/metacity/metacity.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=metacity
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/staging/mjpegtools/PKGBUILD b/staging/mjpegtools/PKGBUILD
deleted file mode 100644
index 8a43df518..000000000
--- a/staging/mjpegtools/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147692 2012-01-27 05:35:16Z eric $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Maintainer: Roberto Carvajal <roberto@archlinux.org>
-
-pkgname=mjpegtools
-pkgver=2.0.0
-pkgrel=2
-pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://mjpeg.sourceforge.net/"
-depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
-makedepends=('gtk2' 'v4l-utils')
-optdepends=('gtk2: glav GUI')
-options=('!makeflags' '!libtool')
-install=mjpegtools.install
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-        mjpegtools-v4l-2.6.38.patch)
-md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
-         '44006d6f844017fe57aa123aa43f4508')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
-  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-  ./configure --prefix=/usr --enable-largefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
-}
diff --git a/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch b/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch
deleted file mode 100644
index 6adeb921c..000000000
--- a/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: lavtools/lavvideo.c
-===================================================================
---- lavtools/lavvideo.c.orig
-+++ lavtools/lavvideo.c
-@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler.
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- 
- #include <videodev_mjpeg.h>
- #include <frequencies.h>
-Index: lavtools/liblavplay.c
-===================================================================
---- lavtools/liblavplay.c.orig
-+++ lavtools/liblavplay.c
-@@ -68,7 +68,8 @@
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-+#define BASE_VIDIOCPRIVATE  192     /* 192-255 are private */
- #else
- #define VIDEO_MODE_PAL		0
- #define VIDEO_MODE_NTSC		1
-Index: lavtools/liblavrec.c
-===================================================================
---- lavtools/liblavrec.c.orig
-+++ lavtools/liblavrec.c
-@@ -63,7 +63,8 @@
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-+#define BASE_VIDIOCPRIVATE  192     /* 192-255 are private */
- #ifdef HAVE_SYS_SOUNDCARD_H
- #include <sys/soundcard.h>
- #endif
-Index: lavtools/testrec.c
-===================================================================
---- lavtools/testrec.c.orig
-+++ lavtools/testrec.c
-@@ -89,7 +89,7 @@
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <linux/soundcard.h>
- 
- /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit
- AS_IF([test "x$with_v4l" != "xno"], [
- case $host in
-   *-*-linux*)
--  AC_CHECK_HEADER(linux/videodev.h,
-+  AC_CHECK_HEADER(libv4l1-videodev.h,
-                   [have_video4linux=true
-                    AC_DEFINE(HAVE_V4L, 1,
- 		             [Building for Linux - using the video4linux API])], [])
-@@ -173,7 +173,7 @@ esac])
- 
- AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"],
-         [have_video4linux=false
--	 AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])])
-+	 AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])])
- AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
- 
- dnl *********************************************************************
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then :
- 
- case $host in
-   *-*-linux*)
--  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-+  ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
- if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
-   have_video4linux=true
- 
-@@ -16407,8 +16407,8 @@ fi
- 
- if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then :
-   have_video4linux=false
--	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5
--$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;}
-+	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5
-+$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;}
- fi
-  if test x$have_video4linux = xtrue; then
-   HAVE_V4L_TRUE=
diff --git a/staging/mjpegtools/mjpegtools.install b/staging/mjpegtools/mjpegtools.install
deleted file mode 100644
index 4d1231686..000000000
--- a/staging/mjpegtools/mjpegtools.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=mjpeg-howto.info
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD
deleted file mode 100644
index 1ed1f0303..000000000
--- a/staging/moc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 145847 2012-01-02 21:43:42Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20110528
-pkgrel=5
-pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
-arch=('i686' 'x86_64')
-url="http://moc.daper.net/"
-license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
-makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
-optdepends=('speex: for using the speex plugin' 
-	    'ffmpeg: for using the ffmpeg plugin'
-	    'taglib: for using the musepack plugin' 
-	    'libmpcdec: for using the musepack plugin' 
-            'wavpack: for using the wavpack plugin' 
-	    'libmodplug: for using the modplug plugin')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
-        gcc-undefined-symbols.diff moc-ffmpeg.patch)
-sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-          'a811a4ac7e049914aab528d3f06a6be6634c2720'
-          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p0 -i ../gcc-undefined-symbols.diff
-  patch -p0 -i ../moc-ffmpeg.patch
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  ./autogen.sh
-  ./configure --prefix=/usr --without-rcc --without-aac \
-    --with-oss  --with-alsa  --with-jack --with-mp3 \
-    --with-musepack --with-vorbis --with-flac --with-wavpack \
-    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-    --with-samplerate --with-curl --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff
deleted file mode 100644
index 09e9b8bda..000000000
--- a/staging/moc/gcc-undefined-symbols.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- decoder.c~	2011-05-08 09:28:28.077137883 +0200
-+++ decoder.c	2011-05-10 21:40:48.887941968 +0200
-@@ -259,6 +259,9 @@
- 	for (i = 0; i < plugins_num; i++)
- 		if (plugins[i].decoder->destroy)
- 			plugins[i].decoder->destroy ();
-+	for (i = 0; i < plugins_num; i++)
-+		if (plugins[i].handle)
-+                    lt_dlclose(plugins[i].handle);
- 
- 	if (lt_dlexit())
- 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch
deleted file mode 100644
index 7554ea14e..000000000
--- a/staging/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -28,12 +28,6 @@
- #include <ffmpeg/avformat.h>
- #endif
- 
--/* libavformat's API will be changing at version 53, but at present there
-- * appears to be no guidance on what will replace the deprecated fields. */
--#ifndef FF_API_OLD_METADATA
--#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
--#endif
--
- /* FFmpeg also likes common names, without that, our common.h and log.h
-  * would not be included. */
- #undef COMMON_H
-@@ -137,7 +131,7 @@
- 	av_read_play (data->ic);
- 	for (i = 0; i < data->ic->nb_streams; i++) {
- 		data->enc = data->ic->streams[i]->codec;
--		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 			audio_index = i;
- 			break;
- 		}
diff --git a/staging/mtpaint/PKGBUILD b/staging/mtpaint/PKGBUILD
deleted file mode 100644
index 50049b123..000000000
--- a/staging/mtpaint/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63381 2012-01-31 21:35:06Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=2
-pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
-arch=('x86_64' 'i686')
-url="http://mtpaint.sourceforge.net/"
-license=('GPL3')
-depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2')
-install=mtpaint.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "libpng15.patch")
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
-            'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	patch -Np1 -i "$srcdir/libpng15.patch"
-	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
-  sed -i 's:-lpng:-lpng -lgif:' _conf.txt
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/staging/mtpaint/libpng15.patch b/staging/mtpaint/libpng15.patch
deleted file mode 100644
index 7df3b2127..000000000
--- a/staging/mtpaint/libpng15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
---- mtpaint-3.31.orig/src/png.c	2010-01-25 00:43:07.000000000 +0200
-+++ mtpaint-3.31/src/png.c	2010-01-25 00:43:39.000000000 +0200
-@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
- 	if (settings->bpp == 3)
- 	{
- 		png_set_strip_16(png_ptr);
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		png_set_palette_to_rgb(png_ptr);
- 		png_set_gray_to_rgb(png_ptr);
- 
-@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
- 		png_set_strip_alpha(png_ptr);
- 		png_set_packing(png_ptr);
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		for (i = 0; i < height; i++)
- 		{
- 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
diff --git a/staging/mtpaint/mtpaint.install b/staging/mtpaint/mtpaint.install
deleted file mode 100644
index 99a538dea..000000000
--- a/staging/mtpaint/mtpaint.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-	update-desktop-database -q
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/netpbm/PKGBUILD b/staging/netpbm/PKGBUILD
deleted file mode 100644
index e94519534..000000000
--- a/staging/netpbm/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 147094 2012-01-21 19:51:59Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-
-pkgname=netpbm
-pkgver=10.57.1
-pkgrel=1
-pkgdesc="A toolkit for manipulation of graphic images"
-arch=('i686' 'x86_64')
-license=('custom' 'BSD' 'GPL' 'LGPL')
-url="http://netpbm.sourceforge.net/"
-depends=('perl' 'libpng' 'libtiff' 'libxml2')
-makedepends=('python2')
-options=('!makeflags')
-# Releases after 10.34 are available via SVN only.
-# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball
-# Get version number from version.mk
-# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
-source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \
-        ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
-        netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
-sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e'
-          'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'
-          'b79cf9d42488fea065ba16262ed97694c47af08d'
-          '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5'
-          '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
-
-build() {
-  cd "${srcdir}/advanced"
-  patch -p1 < ../netpbm-CAN-2005-2471.patch
-  patch -p1 < ../netpbm-security-code.patch
-  patch -p1 < ../netpbm-security-scripts.patch
-  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman
-  sed -i 's|@python|@python2|' buildtools/manpage.mk
-
-  cp config.mk.in  config.mk
-  [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
-  echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk
-  echo 'TIFFLIB = libtiff.so' >> config.mk
-  echo 'JPEGLIB = libjpeg.so' >> config.mk
-  echo 'PNGLIB = libpng.so' >> config.mk
-  echo 'ZLIB = libz.so' >> config.mk
- 
-  sed -i 's|misc|share/netpbm|' common.mk
-  sed -i 's|/link|/lib|' lib/Makefile
-  sed -i 's|install.manweb install.man|install.man|' GNUmakefile
-
-  make
-
-  # Generating useful man pages with html doc
-  cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \
-    -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
-}
-
-package() {
-  cd "${srcdir}/advanced"
-  make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
-
-# Removing dummy man pages
-  rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
-
-  cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
-    -f "${srcdir}/advanced/buildtools/manpage.mk" installman
-
-# Replace obsolete utility
-  echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
-
-# Licensing.  Note that each program in the package has a separate license.
-  install -D -m644 "${srcdir}/advanced/doc/copyright_summary" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
-}
diff --git a/staging/netpbm/netpbm-CAN-2005-2471.patch b/staging/netpbm/netpbm-CAN-2005-2471.patch
deleted file mode 100644
index 3759d7ebe..000000000
--- a/staging/netpbm/netpbm-CAN-2005-2471.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
-+++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
-@@ -711,11 +711,11 @@
-                    ghostscriptProg, arg0,
-                    deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
-                    "-q", "-dNOPAUSE", 
--                   "-dSAFER", "-");
-+                   "-dPARANOIDSAFER", "-");
-     }
- 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-dSAFER", "-", NULL);
-+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
-     
-     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
-              ghostscriptProg, errno, strerror(errno));
diff --git a/staging/netpbm/netpbm-security-code.patch b/staging/netpbm/netpbm-security-code.patch
deleted file mode 100644
index da67a8f92..000000000
--- a/staging/netpbm/netpbm-security-code.patch
+++ /dev/null
@@ -1,1668 +0,0 @@
-diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
---- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
-+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
-@@ -79,6 +79,9 @@ vector (int nl, int nh)
- {
-     float *v;
- 
-+    if(nh < nl)
-+	pm_error("assert: h < l");
-+    overflow_add(nh - nl, 1);
-     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
-     if (v == NULL)
-         pm_error("Unable to allocate memory for a vector.");
-@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     float **m;
- 
-     /* allocate pointers to rows */
-+    if(nrh < nrl)
-+	pm_error("assert: h < l");
-+    overflow_add(nrh - nrl, 1);
-     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
-     if (m == NULL)
-         pm_error("Unable to allocate memory for a matrix.");
-@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     assert (nch >= ncl);
- 
-     /* allocate rows and set pointers to them */
-+    if(nch < ncl)
-+        pm_error("assert: h < l");
-+    overflow_add(nch - ncl, 1);
-     for (i = nrl; i <= nrh; ++i) {
-         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
-         if (m[i] == NULL)
-diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
---- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -106,6 +106,7 @@ main(argc, argv)
- 
- 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
- 
-+    overflow_add(cols, padright);
-     { 
-         /* allocate input row data structure */
-         int plane;
-diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
---- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
-@@ -861,6 +861,8 @@ convertImage(FILE *                     
-     /* Calculate output image dimensions so we can allocate space */
-     jpeg_calc_output_dimensions(cinfoP);
- 
-+    overflow2(cinfoP->output_width, cinfoP->output_components);
-+
-     /* Start decompressor */
-     jpeg_start_decompress(cinfoP);
- 
-diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
---- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
-                  "than the image height (%u rows)", height, rows);
- 
-     outrow = pgm_allocrow(cols) ;
-+    overflow2(width, height);
-     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
-     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
- 
-diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
-diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
---- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
-@@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
-     switch (PNM_FORMAT_TYPE(format)) {
-     case PBM_TYPE:
-         ip.bits_per_pixel = 1;
-+        overflow_add(cols, 7);
-         ip.bytes_per_line = (cols + 7) / 8;
-         ip.spectral = 2;
-         ip.components = 1;
-@@ -647,6 +648,7 @@ main(int argc, char *argv[]) {
-         ip.polarity = 2;
-         break;
-     case PPM_TYPE:
-+        overflow2(cols, 3);
-         ip.bytes_per_line = 3 * cols;
-         ip.bits_per_pixel = 24;
-         ip.spectral = 5;
-diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
---- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
-@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
-            want JPOOL_PERMANENT.  
-         */
-         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
--        jpeg_scan_info * const scan_info = 
-+        const jpeg_scan_info * scan_info;
-+      
-+        overflow2(nscans, sizeof(jpeg_scan_info));
-+      
-+        scan_info =
-             (jpeg_scan_info *)
-             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-                                         scan_info_size);
-@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
-   const long half_maxval = maxval / 2;
-   long val;
- 
-+  overflow_add(maxval, 1);
-+  overflow2(maxval+1, sizeof(JSAMPLE));
-   *rescale_p = (JSAMPLE *)
-     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
-                               (size_t) (((long) maxval + 1L) * 
-@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
-     */
- 
-   /* Allocate the libpnm output and compressor input buffers */
-+  overflow2(cinfo_p->image_width, cinfo_p->input_components);
-   buffer = (*cinfo_p->mem->alloc_sarray)
-     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
-      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
-diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
---- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
-@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
-     }
- }
- 
-+static void *
-+xmalloc2(int x, int y)
-+{
-+    void *mem;
-+
-+    overflow2(x,y);
-+    if( x * y == 0 )
-+        return NULL;
-+
-+    mem = malloc2(x, y);
-+    if( mem == NULL )
-+        pm_error("out of memory allocating %d bytes", x * y);
-+    return mem;
-+}
-+
-+
- static void
- put_big_short(short s)
- {
-@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
- #endif
- 
-     if( storage != STORAGE_VERBATIM ) {
-+        overflow2(channels, rows);
-         MALLOCARRAY_NOFAIL(table, channels * rows);
-         MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
-     }
-@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
-             break;
-         case STORAGE_RLE:
-             tabrow = chan_no * rows + row;
-+            overflow2(chan_no, rows);
-+            overflow_add(chan_no* rows, row);
-             len = rle_compress(temp, cols);    /* writes result into rletemp */
-             channel[chan_no][row].length = len;
-             MALLOCARRAY(p, len);
-diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
---- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -19,6 +19,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /*
-  * rletopnm - A conversion program to convert from Utah's "rle" image format
-diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
---- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc
-         MALLOCARRAY_NOFAIL(image, head->ysize);
-     } else {
-         maxchannel = MIN(3, head->zsize);
-+        overflow2(head->ysize, maxchannel);
-         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
-     }
--    if (table) 
-+    if (table) {
-+        overflow2(head->xsize, 2);
-+        overflow_add(head->xsize*2, 2);
-         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
-+    }
- 
-     for(channel = 0; channel < maxchannel; ++channel) {
-         unsigned int row;
-diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
---- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -69,6 +69,7 @@ char* argv[];
- 	    }
- 	    break;
- 	case PPM_TYPE:
-+	    overflow3(cols, rows, 3);
- 	    picsize = cols * rows * 3;
- 	    planesize = cols * rows;
-             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
-diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
---- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
-@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
-     if (scanbuf == NULL)
-         pm_error("can't allocate memory for scanline buffer");
- 
--    MALLOCARRAY(samplebuf, cols * spp);
-+    /* samplebuf is unsigned int * !!! */
-+    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
-+
-     if (samplebuf == NULL)
-         pm_error("can't allocate memory for row buffer");
- 
-diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
---- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
-@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
-         *colorsP = pnm_allocrow(2);
-         PNM_ASSIGN1((*colorsP)[0], 0);
-         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
-+        overflow_add(h10P->pixmap_width, 15);
-+        if(h10P->pixmap_width < 0)
-+            pm_error("assert: negative width");
-+        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
-         *padrightP =
-             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
-         *bits_per_itemP = 16;
-@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader *  cons
- 
-     *colsP = h11FixedP->pixmap_width;
-     *rowsP = h11FixedP->pixmap_height;
-+    overflow2(h11FixedP->bytes_per_line, 8);
-     *padrightP =
-         h11FixedP->bytes_per_line * 8 -
-         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
-diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c
---- netpbm-10.47.04/converter/other/sunicontopnm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sunicontopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -11,6 +11,7 @@
- */
- 
- #include <string.h>
-+#include <limits.h>
- 
- #include "nstring.h"
- #include "pbm.h"
-@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
-     if (*heightP <= 0)
-         pm_error("invalid height (must be positive): %d", *heightP);
- 
-+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
-+        pm_error( "invalid width: %d", *widthP);
-+    
-+    overflow2(*widthP + 16, *heightP);
-+    
- }
- 
-  
-diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
---- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -245,10 +245,13 @@ main(int argc, char **argv) {
-         pm_readlittleshort(infile, &yy); nInCols = yy;
-     }
-     
-+    overflow2(nOutCols, 8);
-     nOutCols = 8 * nInCols;
-     nOutRows = nInRows;
--    if (bScale) 
-+    if (bScale) {
-+        overflow2(nOutRows, 2);
-         nOutRows *= 2;
-+    }
- 
-     data = pbm_allocarray(nOutCols, nOutRows);
-     
-diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
---- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
-     if (head.h_high < ' ' || head.l_high < ' ')
-         pm_error("Invalid width field in MGR header");
-     
-+    overflow_add(*colsP, pad);
-+
-     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
-     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
-     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
-diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
---- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
-@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
-         res_60x72();
- 
-     pm_close(ifp);
--    exit(0);
-+    return 0;
- }
- 
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
---- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
-@@ -2,6 +2,7 @@
- 
- #include "nstring.h"
- #include "pbm.h"
-+#include <string.h>
- 
- static char bit_table[2][3] = {
- {1, 4, 0x10},
-@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
-     xres = vmap_width * 2;
-     yres = vmap_height * 3;
- 
--    vmap = malloc(vmap_width * vmap_height * sizeof(char));
-+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
-     if(vmap == NULL)
- 	{
-         pm_error( "Cannot allocate memory" );
-diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
---- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
-@@ -123,6 +123,7 @@ putinit (rows, cols)
-   bitsperitem = 0;
-   bitshift = 7;
-   outcol = 0;
-+  overflow_add(cols, 7);
-   outmax = (cols + 7) / 8;
-   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
-   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
-diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
---- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
-@@ -158,6 +158,7 @@ main(int           argc,
-     bitrow = pbm_allocrow(cols);
- 
-     /* Round cols up to the nearest multiple of 8. */
-+    overflow_add(cols, 7);
-     rucols = ( cols + 7 ) / 8;
-     bytesperrow = rucols;       /* GraphOn uses bytes */
-     rucols = rucols * 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
---- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
-@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
- static void
- allocateBuffers(unsigned int const cols) {
- 
-+    overflow_add(cols, 8);
-     rowBufferSize = (cols + 7) / 8;
-+    overflow_add(rowBufferSize, 128);
-+    overflow_add(rowBufferSize, rowBufferSize+128);
-+    overflow_add(rowBufferSize+10, rowBufferSize/8);
-     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
-     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
---- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
-@@ -101,6 +101,7 @@ char *argv[];
-   if( !lflg )
-     left = 0;
- 
-+  overflow_add(left, MAX_COLS - 1);
-   if( rflg )
-   { if( right - left >= MAX_COLS )
-       right = left + MAX_COLS - 1;
-@@ -111,6 +112,8 @@ char *argv[];
-   if( !tflg )
-     top = 0;
- 
-+  overflow_add(top, MAX_LINES - 1);
-+
-   if( bflg )
-   { if( bottom - top >= MAX_LINES )
-       bottom = top + MAX_LINES - 1;
-diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
---- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
-@@ -179,6 +179,7 @@ int main(int argc, char **argv)
-     
-     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
- 
-+    overflow_add(nOutRowsUnrounded, 3);
-     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
-         /* MDA wants rows a multiple of 4 */   
-     nOutCols = nInCols / 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
-diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
-     return 0;
- 
-   case P4:
-+    overflow_add(pbm->width, 7);
-     tmp=(pbm->width+7)/8;
-     tmp2=fread(data,1,tmp,pbm->fptr);
-     if(tmp2 == tmp)
-@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void
-     return;
- 
-   pbm->unread = 1;
--  pbm->revdata = malloc ((pbm->width+7)/8);
-+  overflow_add(pbm->width, 7);
-+  pbm->revdata = malloc((pbm->width+7)/8);
-   memcpy (pbm->revdata, data, (pbm->width+7)/8);
-   pbm->current_line--;
- }
-diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
-@@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
-             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
-     }
- 
-+    overflow_add(Width, 7);
-     Pwidth=(Width+7)/8;
-     printer.fptr=out;
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
---- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
-@@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
- 
-     unsigned char * bitrow;
-     unsigned int row;
-+    
-+    overflow_add(cols, padright);
- 
-     putinit(xbmVersion);
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
---- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -45,6 +45,7 @@ main( argc, argv )
-     bitrow = pbm_allocrow(cols);
-     
-     /* Compute padding to round cols up to the nearest multiple of 16. */
-+    overflow_add(cols, 16);
-     padright = ((cols + 15) / 16) * 16 - cols;
- 
-     putinit(cols, rows);
-diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
---- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
-@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
-     bitrow = pbm_allocrow( cols );
- 
-     /* Compute padding to round cols up to the nearest multiple of 16. */
-+    overflow_add(cols, 16);
-     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
- 
-     printf( "USHORT %s[] = {\n",name);
-diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
---- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
-         if (flagbyte == 7) {            /* long form preamble */
-             integer packetlength = get32() ;    /* character packet length */
-             car = get32() ;         /* character number */
-+            overflow_add(packetlength, pktopbm_pkloc);
-             endofpacket = packetlength + pktopbm_pkloc;
-                 /* calculate end of packet */
-             if ((car >= MAXPKCHAR) || !filename[car]) {
-diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
---- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
-@@ -107,7 +107,9 @@ DIG             [0-9]
- <RASTERMODE>\033\*b{DIG}+W  {
-                             int l;
-                             if (rowCount >= rowCapacity) {
-+				overflow_add(rowCapacity, 100);
-                                 rowCapacity += 100;
-+				overflow2(rowCapacity, sizeof *rows);
-                                 rows = realloc (rows, rowCapacity * sizeof *rows);
-                                 if (rows == NULL)
-                                     pm_error ("Out of memory.");
-@@ -217,6 +219,8 @@ yywrap (void)
-     /*
-      * Quite simple since ThinkJet bit arrangement matches PBM
-      */
-+
-+    overflow2(maxRowLength, 8);
-     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
- 
-     packed_bitrow = malloc(maxRowLength);
-diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
---- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad
- 	pm_error("EOF / read error");
- 
-     *depthP = 1;
-+    overflow_add(*colsP, 15);
-     *padrightP = ((*colsP + 15) / 16) * 16 - *colsP;
-}
-
-diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
---- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -58,6 +58,7 @@ main( argc, argv )
-         pm_error( "depth (%d bits) is too large", depth);
- 
-     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
-+    overflow_add(cols, 7);
-     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
- 
-     for ( row = 0; row < rows; ++row )
-@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad
-     
-     if ( *depthP == 0 )
- 	*depthP = 1;	/* very old file */
--    
-+
-+    overflow_add((int)colsP, 31);
-+        
-     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
-     
-     if ( *colsP != (cols_32 - *padrightP) ) {
-diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
---- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -78,6 +78,7 @@ main(int     argc,
-         pm_error("bits/sample (%d) is too large.", bitspersample);
- 
-     pgm_writepgminit(stdout, cols, rows, maxval, 0);
-+    overflow_add(cols, 7);
-     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
-     for (row = 0; row < rows; ++row) {
-         unsigned int col;
-diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
---- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
-     rawtype *chp;
- 
-     cols = bmhdP->w;
-+    overflow_add(cols, 15);
-     bytes = RowBytes(cols);
-     for( plane = 0; plane < nPlanes; plane++ ) {
-         int mask;
-@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
-  Multipalette handling
-  ****************************************************************************/
- 
-+static void *
-+xmalloc2(x, y)
-+    int x;
-+    int y;
-+{
-+    void *mem;
-+
-+    overflow2(x,y);
-+    if( x * y == 0 )
-+        return NULL;
-+
-+    mem = malloc2(x,y);
-+    if( mem == NULL )
-+        pm_error("out of memory allocating %d bytes", x * y);
-+    return mem;
-+}
-+
- 
- static void
- multi_adjust(cmap, row, palchange)
-@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
-     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
-         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
-     
-+    overflow_add(redmaxval, 1);
-+    overflow_add(greenmaxval, 1);
-+    overflow_add(bluemaxval, 1);
-     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
-     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
-     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
-@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
-             ChangeCount32 = *data++;
-             datasize -= 2;
- 
-+            overflow_add(ChangeCount16, ChangeCount32);
-             changes = ChangeCount16 + ChangeCount32;
-+            overflow_add(changes, 1);
-             for( i = 0; i < changes; i++ ) {
-                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
-                 if( datasize < 2 ) goto fail;
-@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
-             cmap->mp_change[i] = NULL;
-         if( PCHG.StartLine < 0 ) {
-             int nch;
-+            if(PCHG.MaxReg < PCHG.MinReg)
-+                pm_error("assert: MinReg > MaxReg");
-+            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
-             nch = PCHG.MaxReg - PCHG.MinReg +1;
-             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
-             for( i = 0; i < nch; i++ )
-@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
-     if( typeid == ID_ILBM ) {
-         int isdeep;
- 
-+        overflow_add(bmhdP->w, 15);
-         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
-         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
- 
-diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
---- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
-             len = atoi((char*) buf );
-             if ( fread( buf, len, 1, ifp ) != 1 )
-                 pm_error( "bad colormap buf" );
-+            overflow2(cmaplen, 3);
-             if ( cmaplen * 3 != len )
-             {
-                 pm_message(
-@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
-                 pm_error( "bad pixel data header" );
-             buf[8] = '\0';
-             len = atoi((char*) buf );
-+            overflow2(cols, rows);
-             if ( len != cols * rows )
-                 pm_message(
-                     "pixel data length (%d) does not match image size (%d)",
-diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
---- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
-@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
- 
- PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
- 		leaftoppm mtvtoppm neotoppm \
--		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
-+		pcxtoppm pc1toppm pi1toppm pjtoppm \
- 		ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \
- 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
- 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
-diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
---- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
-     /*
-      * clear the pixel buffer
-      */
-+    overflow2(bytesperline, 8);
-     npixels = (bytesperline * 8) / bitsperpixel;
-     p    = pixels;
-     while (--npixels >= 0)
-@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
-     }
- 
-     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
-+    overflow2(BytesPerLine, 8);
-     rawcols = BytesPerLine * 8 / BitsPerPixel;
-     if (headerCols > rawcols) {
-         pm_message("warning - BytesPerLine = %d, "
-diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
---- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -1,3 +1,5 @@
-+#error "Unfixable. Don't ship me"
-+
- /*
-  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
-  *
-diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
---- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -127,19 +127,21 @@ main(argc, argv)
-                 case 'V':   /* send plane */
-                 case 'W':   /* send last plane */
-                     if (rows == -1 || r >= rows || image == NULL) {
--                        if (rows == -1 || r >= rows)
-+                        if (rows == -1 || r >= rows) {
-+                            overflow_add(rows, 100);
-                             rows += 100;
-+                        }
-                         if (image == NULL) {
--                            MALLOCARRAY(image, rows * planes);
--                            MALLOCARRAY(imlen, rows * planes);
-+                            image = (unsigned char **)
-+                                malloc3(rows , planes , sizeof(unsigned char *));
-+                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
-                         }
-                         else {
-+                            overflow2(rows,planes);
-                             image = (unsigned char **) 
--                                realloc(image, 
--                                        rows * planes * 
-+                                realloc2(image, rows * planes,
-                                         sizeof(unsigned char *));
--                            imlen = (int *) 
--                                realloc(imlen, rows * planes * sizeof(int));
-+                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));
-                         }
-                     }
-                     if (image == NULL || imlen == NULL)
-@@ -212,8 +214,10 @@ main(argc, argv)
-                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
-                     for (cmd = image[p + r * planes][c],
-                              val = image[p + r * planes][c+1]; 
--                         cmd >= 0 && i < newcols; cmd--, i++) 
-+                         cmd >= 0 && i < newcols; cmd--, i++) {
-                         buf[i] = val;
-+                        overflow_add(i, 1);
-+                    }
-                 cols = cols > i ? cols : i;
-                 free(image[p + r * planes]);
-                 /* 
-@@ -224,6 +228,7 @@ main(argc, argv)
-                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
-             }
-         }
-+        overflow2(cols, 8);
-         cols *= 8;
-     }
-             
-diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
---- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
-@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
- 
-     int index;
- 
-+    overflow_add(maxval, 1);
-     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
-     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
-     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
-diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
---- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
-@@ -169,7 +169,7 @@ char* argv[];
- 
- 	if (rleflag) {	
- 		pm_message("sending run-length encoded picture data ..." );
--		testimage = (char*) malloc(rows*cols);
-+		testimage = (char*) malloc2(rows, cols);
- 		p = testimage;
- 		for (i=0; i<rows; i++)
- 			for (j=0; j<cols; j++) 
-diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
---- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
-@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
- 
-     maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
-     compmethod = 4;     /* RGB8 files are always compressed */
-+    overflow2(cols, 4);
-     MALLOCARRAY_NOFAIL(compr_row, cols * 4);
- 
-     if( maxval != 255 ) {
-@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
- 
-     maskmethod = 0;     /* no masking - RGBN uses genlock bits */
-     compmethod = 4;     /* RGBN files are always compressed */
-+    overflow2(cols, 2);
-     MALLOCARRAY_NOFAIL(compr_row, cols * 2);
- 
-     if( maxval != 15 ) {
-@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
-     unsigned int i;
-     int * table;
- 
-+    overflow_add(oldmaxval, 1);
-     MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
-     for (i = 0; i <= oldmaxval; ++i)
-         table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
-@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
-         MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
-         for (i = 0; i < RowBytes(cols); ++i)
-             coded_rowbuf[i] = 0;
--        if (DO_COMPRESS)
-+        if (DO_COMPRESS) {
-+            overflow2(cols,2);
-+            overflow_add(cols*2,2);
-             MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
-+	}
-     }
-     
-     switch (mode) {
-diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
---- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
-@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
- 
-     ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
-     pixelrow = ppm_allocrow( cols );
--
-+    
-+    overflow2(cols, 6);
-     obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
-     cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
-     if (mode == C_TRANS_MODE_DELTA)
-diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
---- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
-@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
-         medias = MSize_User;
- 
-     if (dpi300) {
-+        overflow2(medias.maxcols, 2);
-+        overflow2(medias.maxrows, 2);
-         medias.maxcols *= 2;
-         medias.maxrows *= 2;
-     }
-diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
---- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
-@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
-             else                   Planes = 1;
-         }
-     }
-+    overflow2(BitsPerPixel, cols);
-+    overflow_add(BitsPerPixel * cols, 7);
-     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
-     MALLOCARRAY_NOFAIL(indexRow, cols);
-     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
-diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
---- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
-@@ -245,6 +245,8 @@ char *argv[];
-     putShort(stdout, 0);			/* mode */
- 
-     /* Finally, write out the data. */
-+     overflow_add(cols/MAX_COUNT, 1);
-+     overflow_add(cols, cols/MAX_COUNT+1);
-     packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
-     for (row = 0, oc = 0; row < rows; row++)
-         oc += putRow(stdout, row, cols, pixels[row], packed);
-diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
---- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
-@@ -179,6 +179,7 @@ char *argv[];
- 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
- 
- 	pm_close( ifp );
-+	overflow2(cols,2);
- 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
- 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
- 
-diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
---- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
-@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
-         pm_error("image too large; reduce with ppmscale");
-     if (maxval > PCL_MAXVAL)
-         pm_error("color range too large; reduce with ppmcscale");
-+    if (cols < 0 || rows < 0)
-+        pm_error("negative size is not possible");
- 
-     /* Figure out the colormap. */
-     pm_message("Computing colormap...");
-@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) {
-         case 0: /* direct mode (no palette) */
-             bpp = bitsperpixel(maxval); /* bits per pixel */
-             bpg = bpp; bpb = bpp;
-+	    overflow2(bpp, 3);
-+	    overflow_add(bpp*3, 7);
-             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
-             bpr = (bpp<<3)-bpg-bpb; 
-             bpp *= cols;            /* bytes per row now */
-@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) {
-         case 3: case 7: pclindex++;
-         default:
-             bpp = 8/pclindex;
-+	    overflow_add(cols, bpp);
-+	    if(bpp == 0)
-+		pm_error("assert: no bpp");
-             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
-         }
-     }
-+    overflow2(bpp,2);
-     inrow = (char *)malloc((unsigned)bpp);
-     outrow = (char *)malloc((unsigned)bpp*2);
-     runcnt = (signed char *)malloc((unsigned)bpp);
-diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
---- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
-@@ -12,6 +12,7 @@
- 
- #include <math.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "pm_c_util.h"
- #include "winico.h"
-@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c
-    MALLOCARRAY_NOFAIL(rowData, rows);
-    icBitmap->xBytes = xBytes;
-    icBitmap->data   = rowData;
-+   overflow2(xBytes, rows);
-    icBitmap->size   = xBytes * rows;
-    for (y=0;y<rows;y++) {
-       u1 * row;
-@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co
-    MALLOCARRAY_NOFAIL(rowData, rows);
-    icBitmap->xBytes = xBytes;
-    icBitmap->data   = rowData;
-+   overflow2(xBytes, rows);
-    icBitmap->size   = xBytes * rows;
- 
-    for (y=0;y<rows;y++) {
-@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co
-    MALLOCARRAY_NOFAIL(rowData, rows);
-    icBitmap->xBytes = xBytes;
-    icBitmap->data   = rowData;
-+   overflow2(xBytes, rows);
-    icBitmap->size   = xBytes * rows;
- 
-    for (y=0;y<rows;y++) {
-@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico       const MSIcon
-     entry->bitcount      = bpp;
-     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
-     entry->colors        = palette->colors;
-+    overflow2(4, entry->color_count);
-+    overflow_add(xorBitmap->size, andBitmap->size);
-+    overflow_add(xorBitmap->size + andBitmap->size, 40);
-+    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
-     entry->size_in_bytes = 
-         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
-     if (verbose) 
-diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
---- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
-     unsigned int i;
- 
-     /* Allocate memory for printed number.  Abort if error. */
-+    overflow_add(digits, 1);
-     if (!(str = (char *) malloc(digits + 1)))
-         pm_error("out of memory");
- 
-@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
-     unsigned int charsPerPixel;
-     unsigned int xpmMaxval;
-     
-+    if (includeTransparent) overflow_add(ncolors, 1);
-     MALLOCARRAY(cmap, cmapSize);
-     if (cmapP == NULL)
-         pm_error("Out of memory allocating %u bytes for a color map.",
-diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
---- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -46,7 +46,7 @@ main( argc, argv )
- 
-     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
-     pixelrow = ppm_allocrow( cols );
--    buf = (unsigned char *) malloc( 3 * cols );
-+    buf = (unsigned char *) malloc2( 3 , cols );
-     if ( buf == (unsigned char *) 0 )
- 	pm_error( "out of memory" );
- 
-diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
---- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
-@@ -455,6 +455,8 @@ slider(slvecfn   slvec,
-     
-     /* Allocate image buffer and clear it to black. */
-     
-+    overflow_add(ixdots,1);
-+    overflow_add(iydots,1);
-     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
-     PPM_ASSIGN(rgbcolor, 0, 0, 0);
-     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
-diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
---- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
-     header->bits_channel = atoi(a_head.bits_per_channel);
-     header->alpha_flag = atoi(a_head.alpha_channel);
-     if (strlen(a_head.author)) {
-+    	overflow_add(strlen(a_head.author),1);
-         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
-                 1))) {
-             pm_message("ReadXimHeader: can't calloc author string" );
-@@ -126,6 +127,7 @@ ReadXimHeader(FILE *     const in_fp,
-         strncpy(header->author, a_head.author, strlen(a_head.author));
-     }
-     if (strlen(a_head.date)) {
-+        overflow_add(strlen(a_head.date),1);
-         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
-             pm_message("ReadXimHeader: can't calloc date string" );
-             return(0);
-@@ -134,6 +136,7 @@ ReadXimHeader(FILE *     const in_fp,
-         strncpy(header->date, a_head.date, strlen(a_head.date));
-     }
-     if (strlen(a_head.program)) {
-+        overflow_add(strlen(a_head.program),1);
-         if (!(header->program = calloc(
-                     (unsigned int)strlen(a_head.program) + 1, 1))) {
-             pm_message("ReadXimHeader: can't calloc program string" );
-@@ -160,6 +163,7 @@ ReadXimHeader(FILE *     const in_fp,
-     if (header->nchannels == 3 && header->bits_channel == 8)
-         header->ncolors = 0;
-     else if (header->nchannels == 1 && header->bits_channel == 8) {
-+	overflow2(header->ncolors, sizeof(Color));
-         header->colors = (Color *)calloc((unsigned int)header->ncolors,
-                 sizeof(Color));
-         if (header->colors == NULL) {
-diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
---- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
-                        &ncolors, colorsP, &ptab);
-         *transparentP = -1;  /* No transparency in version 1 */
-     }
-+    overflow2(*widthP, *heightP);
-     totalpixels = *widthP * *heightP;
-     MALLOCARRAY(*dataP, totalpixels);
-     if (*dataP == NULL)
-diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
---- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -72,6 +72,7 @@ main(argc, argv)
- 
- 	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
- 	pixrow = ppm_allocrow(cols);
-+    overflow_add(cols, 1);
-     MALLOCARRAY(yuvbuf, (cols+1)/2);
-     if (yuvbuf == NULL)
-         pm_error("Unable to allocate YUV buffer for %d columns.", cols);
-diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
---- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
-@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
- 
-     outpam = inpam;    /* Initial value -- most fields should be same */
-     outpam.file   = ofP;
-+    overflow_add(rightcol, 1);
-+    overflow_add(bottomrow, 1);
-     outpam.width  = rightcol - leftcol + 1;
-     outpam.height = bottomrow - toprow + 1;
- 
-diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
---- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
-@@ -94,6 +94,7 @@ main( argc, argv )
-     if (halftone == QT_FS) {
-         unsigned int col;
-         /* Initialize Floyd-Steinberg. */
-+        overflow_add(newcols, 2);
-         MALLOCARRAY(thiserr, newcols + 2);
-         MALLOCARRAY(nexterr, newcols + 2);
-         if (thiserr == NULL || nexterr == NULL)
-diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
---- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
-@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
-                   xelval **             const btableP) {
- 
-     /* Allocate space for the tables. */
-+    overflow_add(maxval, 1);
-     MALLOCARRAY(*rtableP, maxval+1);
-     MALLOCARRAY(*gtableP, maxval+1);
-     MALLOCARRAY(*btableP, maxval+1);
-diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
---- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
-@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
-     unsigned int pixelCount;
-     unsigned int * lumahist;
- 
-+    overflow_add(maxval, 1);
-     MALLOCARRAY(lumahist, maxval + 1);
-     if (lumahist == NULL)
-         pm_error("Out of storage allocating array for %u histogram elements",
-diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
---- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
-@@ -1,5 +1,8 @@
- #!/bin/csh -f
- #
-+echo "Unsafe code, needs debugging, do not ship"
-+exit 1
-+#
- # pnmindex - build a visual index of a bunch of anymaps
- #
- # Copyright (C) 1991 by Jef Poskanzer.
-diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
---- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
-@@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
- 
-     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
- 
-+    overflow_add(cols, lpad);
-+    overflow_add(cols + lpad, rpad);
-     newcols = cols + lpad + rpad;
- 
-     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
-diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
-diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
---- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
-@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
-     unsigned int plane;
- 
-     unsigned int const fserrSize = pamP->width + 2;
--
-+    overflow_add(pamP->width, 2);
-     fserrP->width = pamP->width;
- 
-     MALLOCARRAY(fserrP->thiserr, pamP->depth);
-@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
- 
-     int col;
-     
-+    overflow_add(pamP->width, 2);
-     for (col = 0; col < pamP->width + 2; ++col) {
-         unsigned int plane;
-         for (plane = 0; plane < pamP->depth; ++plane) 
-diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
---- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
-@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
-                           const int rows, const int cols,
-                           int * newrowsP, int * newcolsP) {
- 
-+    overflow2(rows, cols);
-+
-     if (cmdline.pixels) {
-         if (rows * cols <= cmdline.pixels) {
-             *newrowsP = rows;
-@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
- 
-     if (*newcolsP < 1) *newcolsP = 1;
-     if (*newrowsP < 1) *newrowsP = 1;
-+    
-+    overflow2(*newcolsP, *newrowsP);
- }        
- 
- 
-@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
-        unfilled.  We can address that by stretching, whereas the other
-        case would require throwing away some of the input.
-     */
-+    
-+    overflow2(newcols, SCALE);
-+    overflow2(newrows, SCALE);
-     sxscale = SCALE * newcols / cols;
-     syscale = SCALE * newrows / rows;
- 
-diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
---- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <assert.h>
- #include <math.h>
- #include <string.h>
-+#include <limits.h>
- 
- #include "pm_c_util.h"
- #include "ppm.h"
-@@ -236,6 +237,11 @@ main(int argc, char * argv[]) {
- 
-     shearfac = fabs(tan(cmdline.angle));
- 
-+    if(rows * shearfac >= INT_MAX-1)
-+      pm_error("image too large");
-+    
-+    overflow_add(rows * shearfac, cols+1);
-+
-     newcols = rows * shearfac + cols + 0.999999;
- 
-     pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
-diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
---- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
-+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
-@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
-     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
-     pm_close(ifp);
- 
-+    overflow_add(inpam.maxval, 1);
-     MALLOCARRAY(hist, inpam.maxval + 1);
-     if (hist == NULL)
-         pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
---- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
-@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
-         
-         for (i = 1; i < argc; ++i) {
-             if (i > 1) {
-+                overflow_add(totaltextsize, 1);
-                 totaltextsize += 1;
-                 text = realloc(text, totaltextsize);
-                 if (text == NULL)
-                     pm_error("out of memory allocating space for input text");
-                 strcat(text, " ");
-             } 
-+            overflow_add(totaltextsize, strlen(argv[i]));
-             totaltextsize += strlen(argv[i]);
-             text = realloc(text, totaltextsize);
-             if (text == NULL)
-@@ -711,6 +713,7 @@ getText(const char          cmdline_text
-                 pm_error("A line of input text is longer than %u characters."
-                          "Cannot process.", sizeof(buf)-1);
-             if (lineCount >= maxlines) {
-+                overflow2(maxlines, 2);
-                 maxlines *= 2;
-                 REALLOCARRAY(text_array, maxlines);
-                 if (text_array == NULL)
-@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
-             hmargin = fontP->maxwidth;
-         } else {
-             vmargin = fontP->maxheight;
-+	    overflow2(2, fontP->maxwidth);
-             hmargin = 2 * fontP->maxwidth;
-         }
-     }
-diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
---- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
-@@ -130,7 +130,7 @@ static void gencraters()
-     /* Acquire the elevation array and initialize it to mean
-        surface elevation. */
- 
--    MALLOCARRAY(aux, SCRX * SCRY);
-+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
-     if (aux == NULL) 
-         pm_error("out of memory allocating elevation array");
- 
-diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
---- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
-@@ -68,7 +68,7 @@ main ( argc, argv )
-     kycenter = (fysize - 1) / 2.0;
-     ixsize = fxsize + 0.999;
-     iysize = fysize + 0.999;
--    MALLOCARRAY(fkernel, ixsize * iysize);
-+    fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
-     for (i = 0; i < iysize; i++) 
-         for (j = 0; j < ixsize; j++) {
-             fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
-diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
---- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
-@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
-     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
-     tuple * tuplerow;
- 
--    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
-+    overflow_add(sizeof(tuple *), bytesPerTuple);
-+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
-                       
-     if (tuplerow != NULL) {
-         /* Now we initialize the pointers to the individual tuples
-diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
---- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
-@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
-     */
-     struct tupleint_list_item * retval;
- 
-+    overflow2(pamP->depth, sizeof(sample));
-+    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
-     unsigned int const size = 
-         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
-         + pamP->depth * sizeof(sample);
-diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
---- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
-@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
-         pm_message("pm_filepos passed to pm_check() is %u bytes",
-                    sizeof(pm_filepos));
- #endif
-+        overflow2(bytes_per_row, rows);
-         pm_check(file, check_type, need_raster_size, retval_p);
-     }
- }
---- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
-@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
- }
- 
- 
-+/*
-+ *	Maths wrapping
-+ */
-+ 
-+void __overflow2(int a, int b)
-+{
-+	if(a < 0 || b < 0)
-+		pm_error("object too large");
-+	if(b == 0)
-+		return;
-+	if(a > INT_MAX / b)
-+		pm_error("object too large");
-+}
-+
-+void overflow3(int a, int b, int c)
-+{
-+	overflow2(a,b);
-+	overflow2(a*b, c);
-+}
-+
-+void overflow_add(int a, int b)
-+{
-+	if( a > INT_MAX - b)
-+		pm_error("object too large");
-+}
-+
-+void *malloc2(int a, int b)
-+{
-+	overflow2(a, b);
-+	if(a*b == 0)
-+		pm_error("Zero byte allocation");
-+	return malloc(a*b);
-+}
-+
-+void *malloc3(int a, int b, int c)
-+{
-+	overflow3(a, b, c);
-+	if(a*b*c == 0)
-+		pm_error("Zero byte allocation");
-+	return malloc(a*b*c);
-+}
-+
-+void *realloc2(void * a, int b, int c)
-+{
-+	overflow2(b, c);
-+	if(b*c == 0)
-+		pm_error("Zero byte allocation");
-+	return realloc(a, b*c);
-+}
- 
-diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
---- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
-@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
- #endif
- 
- 
-+void *malloc2(int, int);
-+void *malloc3(int, int, int);
-+#define overflow2(a,b) __overflow2(a,b)
-+void __overflow2(int, int);
-+void overflow3(int, int, int);
-+void overflow_add(int, int);
-+
- #endif
-diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
---- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
-+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
-@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
-             pamP->width = intsqrt;
-         else 
-             pamP->width = intsqrt + 1;
-+            overflow_add(intsqrt, 1);
-     }
-     {
-         unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
---- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_addhist.c - Add to the HISTORY comment in header
-@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
-         return;
-     
-     length = 0;
--    for (i = 0; argv[i]; ++i)
-+    for (i = 0; argv[i]; ++i) {
-+	overflow_add(length, strlen(argv[i]));
-+	overflow_add(length+1, strlen(argv[i]));
-         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
-+    }
- 
-     time(&temp);
-     timedate = ctime(&temp);
-     length += strlen(timedate);        /* length of date and time in ASCII. */
- 
-+    overflow_add(strlen(padding), 4);
-+    overflow_add(strlen(histoire), strlen(padding) + 4);
-+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
-     length += strlen(padding) + 3 + strlen(histoire) + 1;
-         /* length of padding, "on "  and length of history name plus "="*/
-     if (in_hdr) /* if we are interested in the old comments... */
-@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
-     else
-         old = NULL;
-     
--    if (old && *old)
-+    if (old && *old) {
-+	overflow_add(length, strlen(old));
-         length += strlen(old);       /* add length if there. */
-+    }
- 
-+    overflow_add(length, 1);
-     ++length;                               /*Cater for the null. */
- 
-     MALLOCARRAY(newc, length);
-diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
---- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_getrow.c - Read an RLE file in.
-@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
-         register char * cp;
- 
-         VAXSHORT( comlen, infile ); /* get comment length */
-+	overflow_add(comlen, 1);
-         evenlen = (comlen + 1) & ~1;    /* make it even */
-         if ( evenlen )
-         {
-diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
---- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_hdr.c - Functions to manipulate rle_hdr structures.
-@@ -79,7 +81,10 @@ int img_num;
-     /* Fill in with copies of the strings. */
-     if ( the_hdr->cmd != pgmname )
-     {
--	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
-+	char *tmp ;
-+
-+	overflow_add(strlen(pgmname), 1);
-+	tmp = malloc( strlen( pgmname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, pgmname );
- 	the_hdr->cmd = tmp;
-@@ -87,7 +92,9 @@ int img_num;
- 
-     if ( the_hdr->file_name != fname )
-     {
--	char *tmp = (char *)malloc( strlen( fname ) + 1 );
-+	char *tmp;
-+	overflow_add(strlen(fname), 1);
-+	tmp = malloc( strlen( fname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, fname );
- 	the_hdr->file_name = tmp;
-@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->bg_color )
-     {
- 	int size = to_hdr->ncolors * sizeof(int);
-+	overflow2(to_hdr->ncolors, sizeof(int));
- 	to_hdr->bg_color = (int *)malloc( size );
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
- 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
-@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->cmap )
-     {
- 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
--	to_hdr->cmap = (rle_map *)malloc( size );
-+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
- 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
-     }
-@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
- 	int size = 0;
- 	CONST_DECL char **cp;
- 	for ( cp=to_hdr->comments; *cp; cp++ )
-+	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Count the comments. */
-+ 	}
- 	/* Check if there are really any comments. */
- 	if ( size )
- 	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Copy the NULL pointer, too. */
-+	    overflow2(size, sizeof(char *));
- 	    size *= sizeof(char *);
- 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
- 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
-diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
---- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
-@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
-                    bool *        const noSubprocessP,
-                    const char ** const errorP) {
- 
--#ifdef NO_OPEN_PIPES
-     *noSubprocessP = TRUE;
--#else
--    const char *cp;
--
--    reapChildren(catchingChildrenP, pids);
--
--    /*  Real file, not stdin or stdout.  If name ends in ".Z",
--     *  pipe from/to un/compress (depending on r/w mode).
--     *  
--     *  If it starts with "|", popen that command.
--     */
--        
--    cp = file_name + strlen(file_name) - 2;
--    /* Pipe case. */
--    if (file_name[0] == '|') {
--        pid_t thepid;     /* PID from my_popen */
--
--        *noSubprocessP = FALSE;
--
--        *fpP = my_popen(file_name + 1, mode, &thepid);
--        if (*fpP == NULL)
--            *errorP = "%s: can't invoke <<%s>> for %s: ";
--        else {
--            /* One more child to catch, eventually. */
--            if (*catchingChildrenP < MAX_CHILDREN)
--                pids[(*catchingChildrenP)++] = thepid;
--        }
--    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
--        /* Compress case. */
--        pid_t thepid;     /* PID from my_popen. */
--        const char * command;
--
--        *noSubprocessP = FALSE;
--        
--        if (*mode == 'w')
--            pm_asprintf(&command, "compress > %s", file_name);
--        else if (*mode == 'a')
--            pm_asprintf(&command, "compress >> %s", file_name);
--        else
--            pm_asprintf(&command, "compress -d < %s", file_name);
--        
--        *fpP = my_popen(command, mode, &thepid);
--
--        if (*fpP == NULL)
--            *errorP = "%s: can't invoke 'compress' program, "
--                "trying to open %s for %s";
--        else {
--            /* One more child to catch, eventually. */
--            if (*catchingChildrenP < MAX_CHILDREN)
--                pids[(*catchingChildrenP)++] = thepid;
--        }
--        pm_strfree(command);
--    } else {
--        *noSubprocessP = TRUE;
--        *errorP = NULL;
--    }
--#endif
- }
- 
- 
-diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
---- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_putcom.c - Add a picture comment to the header struct.
-@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
-         const char * v;
-         const char ** old_comments;
-         int i;
--        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
-+        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
-+	    overflow_add(i, 1);
-             if (match(value, *cp) != NULL) {
-                 v = *cp;
-                 *cp = value;
-                 return v;
-             }
-+	}
-         /* Not found */
-         /* Can't realloc because somebody else might be pointing to this
-          * comments block.  Of course, if this were true, then the
-diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
---- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * Runput.c - General purpose Run Length Encoding.
-@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
-     if ( the_hdr->background != 0 )
-     {
- 	register int i;
--	register rle_pixel *background =
--	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
-+	register rle_pixel *background;
- 	register int *bg_color;
-+
-+	overflow_add(the_hdr->ncolors,1);
-+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
- 	/* 
- 	 * If even number of bg color bytes, put out one more to get to 
- 	 * 16 bit boundary.
-@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
- 	/* Big-endian machines are harder */
- 	register int i, nmap = (1 << the_hdr->cmaplen) *
- 			       the_hdr->ncmap;
--	register char *h_cmap = (char *)malloc( nmap * 2 );
-+	register char *h_cmap = (char *)malloc2( nmap, 2 );
- 	if ( h_cmap == NULL )
- 	{
- 	    fprintf( stderr,
-diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
---- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
-@@ -38,6 +38,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- 
- #include "rle.h"
-@@ -65,8 +67,8 @@ typedef int *ptr;
- /* 
-  * Storage allocation macros
-  */
--#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
--#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
-+#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
-+#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
- 
- #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
- #define USE_PROTOTYPES
---- advanced/urt/rle_hdr.c.old	2012-01-21 05:57:25.000000000 -0500
-+++ advanced/urt/rle_hdr.c	2012-01-21 05:57:50.000000000 -0500
-@@ -29,6 +29,18 @@
- 
- #include <string.h>
- 
-+/* 
-+ * Provided by pm library
-+ */
-+ 
-+extern void overflow_add(int, int);
-+#define overflow2(a,b) __overflow2(a,b)
-+extern void __overflow2(int, int);
-+extern void overflow3(int, int, int);
-+extern void *malloc2(int, int);
-+/*extern void *malloc3(int, int, int);*/
-+extern void *realloc2(void *, int, int);
-+
- /*****************************************************************
-  * TAG( rle_names )
-  *
diff --git a/staging/netpbm/netpbm-security-scripts.patch b/staging/netpbm/netpbm-security-scripts.patch
deleted file mode 100644
index 557914b66..000000000
--- a/staging/netpbm/netpbm-security-scripts.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-diff -up netpbm-10.47.05/converter/other/anytopnm.security-scripts netpbm-10.47.05/converter/other/anytopnm
---- netpbm-10.47.05/converter/other/anytopnm.security-scripts	2009-12-10 08:34:36.000000000 +0100
-+++ netpbm-10.47.05/converter/other/anytopnm	2010-03-16 21:28:09.000000000 +0100
-@@ -510,10 +510,7 @@ else
-     inputFile="-"
- fi
- 
--tempdir="${TMPDIR-/tmp}/anytopnm.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
--trap 'rm -rf $tempdir' 0
-+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
- 
- # Take out all spaces
- # Find the filename extension for last-ditch efforts later
-@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
-     echo "$progname: unknown file type.  " \
-         "'file' says mime type is '$mimeType', " 1>&2
-     echo "type description is '$typeDescription'" 1>&2
-+    if [ -d "$tempdir" ] ; then
-+        rm -rf "$tempdir"
-+    fi
-+
-     exit 1
-     fi
- 
- convertIt $file $filetype
- 
-+if [ -d "$tempdir" ] ; then
-+    rm -rf "$tempdir"
-+fi
-+
- exit 0
-diff -up netpbm-10.47.05/editor/pamstretch-gen.security-scripts netpbm-10.47.05/editor/pamstretch-gen
---- netpbm-10.47.05/editor/pamstretch-gen.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/pamstretch-gen	2010-03-16 21:28:47.000000000 +0100
-@@ -31,13 +31,9 @@ if [ "$1" = "" ]; then
-   exit 1
- fi
- 
--tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
-+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
- trap 'rm -rf $tempdir' 0 1 3 15
- 
--tempfile=$tempdir/pnmig
--
- if ! cat $2 >$tempfile 2>/dev/null; then
-   echo 'pamstretch-gen: error reading file' 1>&2
-   exit 1
-diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/editor/pnmmargin
---- netpbm-10.47.05/editor/pnmmargin.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/pnmmargin	2010-03-16 21:28:09.000000000 +0100
-@@ -11,15 +11,11 @@
- # documentation.  This software is provided "as is" without express or
- # implied warranty.
- 
--tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
--trap 'rm -rf $tempdir' 0 1 3 15
--
--tmp1=$tempdir/pnmm1
--tmp2=$tempdir/pnmm2
--tmp3=$tempdir/pnmm3
--tmp4=$tempdir/pnmm4
-+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
-+tmp1="$tmpdir/tmp1"
-+tmp2="$tmpdir/tmp2"
-+tmp3="$tmpdir/tmp3"
-+tmp4="$tmpdir/tmp4"
- 
- color="-gofigure"
- plainopt=""
-@@ -90,6 +86,7 @@ else
-         -white | -black )
-         pnmpad $plainopt $color \
-             -left=$size -right=$size -top=$size -bottom=$size $tmp1
-+	rm -rf "$tmpdir"
-         exit
-         ;;
-         * )
-@@ -102,7 +99,4 @@ else
-     pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
-     pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
- fi
--
--
--
--
-+rm -rf "$tmpdir"
-diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade	2010-03-16 21:28:09.000000000 +0100
-@@ -14,6 +14,7 @@
- #
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- use strict;
-+use File::Temp "tempdir";
- 
- my $SPREAD =  1;
- my $SHIFT =   2;
-@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
- 
- print("Frames are " . $width . "W x " . $height . "H\n");
- 
-+#
-+# We create a tmp-directory right here
-+#
-+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
-+
-+
- if ($first_file eq "undefined") {
-     print "Fading from black to ";
--    system("ppmmake \\#000 $width $height >junk1$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
- } else {
-     print "Fading from $first_file to ";
--    system("cp", $first_file, "junk1$$.ppm");
-+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
- }
- 
- if ($last_file eq "undefined") {
-     print "black.\n";
--    system("ppmmake \\#000 $width $height >junk2$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
- } else {
-     print "$last_file\n";
--    system("cp", $last_file, "junk2$$.ppm");
-+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
- }
- 
- #
-@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
- #
- 
- # Here's what our temporary files are:
--#   junk1$$.ppm: The original (fade-from) image
--#   junk2$$.ppm: The target (fade-from) image
--#   junk3$$.ppm: The frame of the fade for the current iteration of the 
--#                the for loop.
--#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
--#                 image to another, this is the first frame of that 
--#                 sequence.
--#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
-+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
-+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
-+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
-+#                	 the for loop.
-+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-+#                         image to another, this is the first frame of that 
-+#                         sequence.
-+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
- 
- my $i;    # Frame number
- for ($i = 1; $i <= $nframes; $i++) {
-@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
-     if ($mode eq $SPREAD) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10]) * 100;
--            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10])*100;
--            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $SHIFT) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10])*100;
--            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10]) * 100;
--            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $RELIEF) {
-         if ($i == 1) {
--            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
-+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
-+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
-         }
-     } elsif ($mode eq $OIL) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $EDGE) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         } 
-     } elsif ($mode eq $BENTLEY) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $BLOCK) {
-         if ($i <= 10) {
-             my $n = 1 - 1.9*$spline20[$i];
--            system("pamscale $n junk1$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = 1 - 1.9*$spline20[31-$i];
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk2a$$.ppm");
-+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
-         }    
-     } elsif ($mode eq $MIX) {
-         my $fade_factor = sqrt(1/($nframes-$i+1));
--        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
-+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-     } else {
-         print("Internal error: impossible mode value '$mode'\n");
-     }
- 
-     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
--    system("cp", "junk3$$.ppm", $outfile);
-+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
- }
- 
- #
- #  Clean up shop.
- #
--system("rm junk*$$.ppm");
-+system("rm $tmpdir/junk*$$.ppm");
- 
- exit(0);
-diff -up netpbm-10.47.05/editor/ppmquantall.security-scripts netpbm-10.47.05/editor/ppmquantall
---- netpbm-10.47.05/editor/ppmquantall.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmquantall	2010-03-16 21:28:09.000000000 +0100
-@@ -70,12 +70,8 @@ for i in ${files[@]}; do
-     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
- done
- 
--tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
--trap 'rm -rf $tempdir' 0 1 3 15
--
--all=$tempdir/pqa.all.$$
-+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
-+rm -f $all
- 
- pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
- if [ $? != 0 ]; then
-diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow
---- netpbm-10.47.05/editor/ppmshadow.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmshadow	2010-03-16 21:28:09.000000000 +0100
-@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
- 
- 
- my $tmpdir = $ENV{TMPDIR} || "/tmp";
--my $ourtmp = "$tmpdir/ppmshadow$$";
--mkdir($ourtmp, 0777) or
--    die("Unable to create directory for temporary files '$ourtmp");
-+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
-+if ($? >> 8) {
-+    die "Can't create directory for temporary files";
-+}
- 
- #   Process command line options
- 
diff --git a/staging/neverball/PKGBUILD b/staging/neverball/PKGBUILD
deleted file mode 100644
index 2413373e9..000000000
--- a/staging/neverball/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 146885 2012-01-19 03:40:43Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=neverball
-pkgver=1.5.4
-pkgrel=4
-pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
-arch=('i686' 'x86_64')
-url="http://neverball.org/"
-license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
-makedepends=('mesa')
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch)
-sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
-          'f71982b7187d569c57b30c4c40fedd6c0e72baca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
-  patch -p0 -i ../neverball-1.5.4-underlink.patch
-
-  if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
-  else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
-  fi
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
-  install -d "${pkgdir}"/usr/share/man/man{1,6}
-
-  install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
-  cp -r locale/* "${pkgdir}/usr/share/locale/"
-  cp -r data/* "${pkgdir}/usr/share/neverball/"
-  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
-  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
-  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
-  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
-
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
-  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-}
diff --git a/staging/neverball/neverball-1.5.4-underlink.patch b/staging/neverball/neverball-1.5.4-underlink.patch
deleted file mode 100644
index 1a848cad3..000000000
--- a/staging/neverball/neverball-1.5.4-underlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.old	2011-06-22 06:30:52.441788160 +0200
-+++ Makefile	2011-06-22 06:31:59.754087534 +0200
-@@ -138,7 +138,7 @@
- endif
- 
- ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
--    -lvorbisfile $(OGL_LIBS)
-+    -lvorbisfile $(OGL_LIBS) -lX11
- 
- #------------------------------------------------------------------------------
- 
---- Makefile.old	2012-01-18 21:28:23.000000000 -0500
-+++ Makefile	2012-01-18 21:28:55.000000000 -0500
-@@ -131,7 +131,7 @@
-     OGL_LIBS  := -framework OpenGL
- endif
- 
--BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
- 
- ifdef DARWIN
-     BASE_LIBS += -L/opt/local/lib
diff --git a/staging/nx-common/NXproto.h.64bit.diff b/staging/nx-common/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/staging/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/staging/nx-common/PKGBUILD b/staging/nx-common/PKGBUILD
deleted file mode 100644
index 372871404..000000000
--- a/staging/nx-common/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 147024 2012-01-20 21:12:16Z andyrtr $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nx-common
-pkgver=3.5.0
-pkgrel=3
-pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://nomachine.com/"
-depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
-	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
-	nxcompsh-gcc43.patch
-	nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
-         '84ade443b79ea079380b754aba9d392e'
-         'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
-
-build() {
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- 
-  ./configure --prefix=/opt/NX
-  make
-  # nxssh
-  cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
-  make
-}
-
-package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib 
-
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
-  # nxssh
-  cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
-}
diff --git a/staging/nx-common/nx-3.5.0-libpng15.patch b/staging/nx-common/nx-3.5.0-libpng15.patch
deleted file mode 100644
index c8f2a9559..000000000
--- a/staging/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/staging/nx-common/nxcompsh-gcc43.patch b/staging/nx-common/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/staging/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/staging/nxserver/NXproto.h.64bit.diff b/staging/nxserver/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/staging/nxserver/NXproto.h.64bit.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- nxcomp.old/NXproto.h	2006-06-19 19:55:56.000000000 +0200
-+++ nxcomp/NXproto.h	2007-02-12 18:17:41.000000000 +0100
-@@ -26,6 +26,30 @@
- #include <X11/Xmd.h>
- #include <X11/Xproto.h>
- 
-+/*
-+  Copied from Xproto.h
-+ */
-+
-+/* For the purpose of the structure definitions in this file,
-+we must redefine the following types in terms of Xmd.h's types, which may
-+include bit fields.  All of these are #undef'd at the end of this file,
-+restoring the definitions in X.h.  */
-+
-+#define Window CARD32
-+#define Drawable CARD32
-+#define Font CARD32
-+#define Pixmap CARD32
-+#define Cursor CARD32
-+#define Colormap CARD32
-+#define GContext CARD32
-+#define Atom CARD32
-+#define VisualID CARD32
-+#define Time CARD32
-+#define KeyCode CARD8
-+#define KeySym CARD32
-+
-+/* End copied from Xproto.h */
-+
- #define sz_xNXGetControlParametersReq           4
- #define sz_xNXGetCleanupParametersReq           4
- #define sz_xNXGetImageParametersReq             4
-@@ -343,9 +367,9 @@
-     CARD8    dstDepth;
-     CARD32   srcLength B32;
-     CARD32   dstLength B32;
--    INT16    srcX B16, srcY B16;
-+    CARD16    srcX B16, srcY B16;
-     CARD16   srcWidth B16, srcHeight B16;
--    INT16    dstX B16, dstY B16;
-+    CARD16    dstX B16, dstY B16;
-     CARD16   dstWidth B16, dstHeight B16;
- } xNXPutPackedImageReq;
- 
-@@ -463,4 +487,20 @@
- }
- #endif
- 
-+/* Copied from Xproto.h */
-+
-+/* restore these definitions back to the typedefs in X.h */
-+#undef Window
-+#undef Drawable
-+#undef Font
-+#undef Pixmap
-+#undef Cursor
-+#undef Colormap
-+#undef GContext
-+#undef Atom
-+#undef VisualID
-+#undef Time
-+#undef KeyCode
-+#undef KeySym
-+
- #endif /* NXproto_H */
diff --git a/staging/nxserver/PKGBUILD b/staging/nxserver/PKGBUILD
deleted file mode 100644
index 5110e7097..000000000
--- a/staging/nxserver/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 147028 2012-01-20 21:33:04Z andyrtr $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nxserver
-pkgver=3.5.0
-pkgrel=5
-pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
-arch=(i686 x86_64)
-url="http://nomachine.com/"
-license=('GPL')
-depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
-	 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
-         'xorg-sessreg')
-makedepends=('imake')
-source=(
-#X11 support programs and libraries
-http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
-#X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
-#Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
-# gcc 43 fix
-nxcompsh-gcc43.patch
-nx-3.5.0-libpng15.patch)
-options=(!libtool) 
-md5sums=('12060433a74ac61a1c776d1d6d136117'
-         '84c7f1575d9a1506370125ed050514ab'
-         'cf38ec1e5a5f6453946cd387c14f2684'
-         'ad8c0f133122c6d07732ca69c8759410'
-         '0a36c7e6a86c6c741179464b8f79c487'
-         '84ade443b79ea079380b754aba9d392e'
-         '488bb4d9b8e9f82dc272b4e6e9c57d30'
-         'abde2ccc33e31fc695031c2cfb60f3dd'
-         '90a762dd9eb19c8c97876ad837923857'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
-
-build() {
-  cd ${srcdir}
-
-  # nxcomp   
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompshad
-  cd ${srcdir}/nxcompshad
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
-  ./configure --prefix=/opt/NX
-  make
-  # nxproxy
-  cd ${srcdir}/nxproxy
-  ./configure --prefix=/opt/NX
-  make
-  # nx-X11
-  cd ${srcdir}/nx-X11
-  make World
-  # nxcompext
-  cd ${srcdir}/nxcompext 
-  ./configure --prefix=/opt/NX
-  make
-}
-
-package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib
-
-  # nxcompshad
-  cd ${srcdir}/nxcompshad
-  cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib
-  # nxproxy
-  cd ${srcdir}/nxproxy
-  make prefix=${pkgdir}/opt/NX install
-  # nx-X11
-  cd ${srcdir}/nx-X11
-  cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib
-  cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib
-  cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib
-  install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent
-  install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth
-  # nxcompext
-  cd ${srcdir}/nxcompext 
-  cp -a libXcompext.so* ${pkgdir}/opt/NX/lib
-}
\ No newline at end of file
diff --git a/staging/nxserver/nx-3.5.0-libpng15.patch b/staging/nxserver/nx-3.5.0-libpng15.patch
deleted file mode 100644
index c8f2a9559..000000000
--- a/staging/nxserver/nx-3.5.0-libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
---- nxcomp.orig/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
-+++ nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
-@@ -414,7 +414,7 @@
- 
-   png_read_info(pngPtr, infoPtr);
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -565,7 +565,7 @@
- 
-   png_read_info( pngPtr, infoPtr ) ;
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -709,7 +709,7 @@
-   png_read_info(pngPtr, infoPtr) ;
- 
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
diff --git a/staging/nxserver/nxcompsh-gcc43.patch b/staging/nxserver/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/staging/nxserver/nxcompsh-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nxcompsh/Misc.h~	2007-06-04 13:39:49.000000000 +0200
-+++ nxcompsh/Misc.h	2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
- 
--#include <iostream.h>
-+#include <iostream>
- 
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
- 
- //
- // Error handling macros.
- 
diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD
deleted file mode 100644
index be1122504..000000000
--- a/staging/opencv/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 147678 2012-01-26 14:03:05Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.3.1_a
-_realver=2.3.1
-pkgrel=4
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('opencv-docs'
-            'opencv-samples'
-            'eigen2'
-            'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
-md5sums=('82e4b6bfa349777233eea09b075e931e')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D BUILD_TESTS=OFF'
-            '-D ENABLE_SSE=ON'
-            '-D ENABLE_SSE2=ON'
-            '-D ENABLE_SSE3=OFF'
-            '-D ENABLE_SSSE3=OFF'
-            '-D ENABLE_SSE41=OFF'
-            '-D ENABLE_SSE42=OFF'
-            '-D BUILD_EXAMPLES=ON'
-            '-D INSTALL_C_EXAMPLES=ON'
-            '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
-
-build() {
-  cd "$srcdir/$_realname-$_realver"
-
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
-  cmake ${_cmakeopts[@]} .
-
-  make
-}
-
-package_opencv() {
-  cd "$srcdir/$_realname-$_realver"
-
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir/usr/share"
-
-  # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
-
-  # separate docs package; also be -R friendly
-  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  unset depends
-  unset optdepends
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=('bash')
-  unset optdepends
-  unset options
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/opengtl/PKGBUILD b/staging/opengtl/PKGBUILD
deleted file mode 100644
index 30d4c64d7..000000000
--- a/staging/opengtl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147180 2012-01-24 01:25:15Z foutrelis $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andries Radu <admiral0@live.it>
-
-pkgname=opengtl
-pkgver=0.9.16
-pkgrel=1
-pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
-url="http://www.opengtl.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc-libs' 'llvm')
-makedepends=('cmake' 'libpng')
-optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../OpenGTL-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/openjdk6/PKGBUILD b/staging/openjdk6/PKGBUILD
deleted file mode 100644
index 428f10348..000000000
--- a/staging/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,183 +0,0 @@
-# $Id: PKGBUILD 147004 2012-01-20 15:47:29Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=('openjdk6' 'openjdk6-src')
-pkgbase="openjdk6"
-_javaver=6
-_icedteaver=1.10.5
-_openjdk_version=b22
-_openjdk_date=28_feb_2011
-pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
-license=('custom')
-makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'libxt' 'nss'
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6')
-options=('!emptydirs') # 'force') # force needed for hg shots
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_01.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
-	fix_jdk_cmds_path.diff
-	fix_corba_cmds_path.diff
-	fontconfig-paths.diff
-	nonreparenting-wm.diff
-	openjdk6.profile
-	openjdk6.profile.csh
-    glibc2_15.diff)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_01.zip
-	jdk6-jaxws-b20.zip
-	jdk6-jaf-b20.zip)
-md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
-         '2d2bbbb0f9b81f1fec41ec730da8a933'
-         'ef7a8b3624ea904bf584bc46d79b5e75'
-         '91adfd41e6f001add4f92ae31216b1e3'
-         'bc95c133620bd68c161cac9891592901'
-         '5da3e39fa60985576c4f37d1491efbe2'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ee1afda124d5927345014ab382ef581e'
-         '9b4d368f5ee08de248eaf029303a446c'
-         '74c4a7adc782edd087802bf92ae3d6d0'
-         'fdf295e2f186dfa4d308691a3d7ac8c5'
-         '0c8f0a398c88f85e0db44b4417562cf3')
-
-build() {
-
-  unset JAVA_HOME
-  unset CLASSPATH
-  
-    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-
-  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-
-  autoreconf -i
-
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/glibc2_15.diff"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-  unset MAKEFLAGS
-
-  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-xalan2-jar=/usr/share/java/xalan.jar \
-	--with-ant-home=/usr/share/java/apache-ant \
-	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
-	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-bootstrap
-  LD_PRELOAD="" make 
-}
-
-package_openjdk6() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
- backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
-            'alsa-lib: for sound'
-            'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime')
- provides=('java-environment=6' 'java-runtime=6')
- install=openjdk6.install
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-
-   # Install main files.
-  cp -a bin include lib ${pkgdir}/${_jvmdir}/ 
-  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ 
-
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src 
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc 
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
-   # Install man pages.
-  install -m755 -d ${pkgdir}/usr/share/man/man1
-  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
-  
-   # Install demos and samples.
-  cp -a demo ${pkgdir}/${_jvmdir}/ 
-  install -m755 -d sample/rmi
-  mv bin/java-rmi.cgi sample/rmi 
-  cp -a sample ${pkgdir}/${_jvmdir}/ 
-  popd
-
-  # Install icons and menu entries.
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
-    install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-      ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png 
-  done
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-
-  # link binaries into /usr/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} \
-      ${pkgdir}/usr/bin 
-  done
-  popd
-
-  # link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
- 
-  # set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh 
-  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
-  
-  # install license
-  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openjdk6-src() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6')
- 
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-  
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-   # Install src.zip file
-  cp -a src.zip ${pkgdir}/${_jvmdir}/ 
-}
diff --git a/staging/openjdk6/fix_corba_cmds_path.diff b/staging/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/staging/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/staging/openjdk6/fix_jdk_cmds_path.diff b/staging/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index 7e16e1744..000000000
--- a/staging/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -76,10 +76,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -126,7 +126,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -173,7 +173,7 @@
-   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
- 
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/staging/openjdk6/fontconfig-paths.diff b/staging/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/staging/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/staging/openjdk6/glibc2_15.diff b/staging/openjdk6/glibc2_15.diff
deleted file mode 100644
index 8fe1b077a..000000000
--- a/staging/openjdk6/glibc2_15.diff
+++ /dev/null
@@ -1,236 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent  2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -34,8 +34,6 @@
- 
- // Portions of code courtesy of Clifford Click
- 
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
--
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
- // all inherited from this class.  The various identity values are supplied
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jniCheck.cpp
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnter.xsl
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnv.cpp
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiExport.cpp
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/runtime/interfaceSupport.hpp
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
\ No newline at end of file
diff --git a/staging/openjdk6/nonreparenting-wm.diff b/staging/openjdk6/nonreparenting-wm.diff
deleted file mode 100644
index 65fa66e89..000000000
--- a/staging/openjdk6/nonreparenting-wm.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-index 68d1ff7..878327e 100644
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -99,7 +99,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
-     }
- 
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants {
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants {
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants {
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/staging/openjdk6/openjdk6.install b/staging/openjdk6/openjdk6.install
deleted file mode 100644
index 653c8fe2f..000000000
--- a/staging/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/openjdk6.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/staging/openjdk6/openjdk6.profile b/staging/openjdk6/openjdk6.profile
deleted file mode 100644
index 9da4421ef..000000000
--- a/staging/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/staging/openjdk6/openjdk6.profile.csh b/staging/openjdk6/openjdk6.profile.csh
deleted file mode 100644
index 3cb15fd49..000000000
--- a/staging/openjdk6/openjdk6.profile.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk"
-setenv J2REDIR "$J2SDKDIR/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/staging/openldap/PKGBUILD b/staging/openldap/PKGBUILD
deleted file mode 100644
index 7a0e367f7..000000000
--- a/staging/openldap/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 145851 2012-01-03 02:45:43Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.28
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default ntlm.patch)
-sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
-          'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
-          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
-  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
-  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
-  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
-
-  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
-  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
-    --enable-ipv6 --enable-syslog --enable-local \
-    --enable-bdb --enable-hdb \
-    --enable-crypt --enable-dynamic \
-    --with-threads  --disable-wrappers \
-    --enable-spasswd --with-cyrus-sasl \
-    --enable-overlays=mod --enable-modules=yes
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make test
-}
-
-package_libldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'libfetch' 'e2fsprogs')
-  backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in include libraries doc/man/man3 ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
-  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
-  depends=("libldap>=${pkgver}" '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/staging/openldap/ntlm.patch b/staging/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/staging/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/staging/openldap/openldap.install b/staging/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/staging/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/staging/openldap/slapd b/staging/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/staging/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/staging/openldap/slapd.default b/staging/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/staging/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/staging/pam/PKGBUILD b/staging/pam/PKGBUILD
deleted file mode 100644
index 17ca2bdc8..000000000
--- a/staging/pam/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 146066 2012-01-04 22:47:27Z stephane $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.5
-pkgrel=2
-pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib' 'libtirpc')
-makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
-source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
-        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
-        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
-        other)
-options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
-         'e2788389a6c59224110a45fcff30e02b'
-         '6e6c8719e5989d976a14610f340bd33a')
-
-build() {
-  cd $srcdir/Linux-PAM-$pkgver
-  ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
-  make
-}
-
-package() {
-  cd $srcdir/Linux-PAM-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
-  install -D -m644 ../other $pkgdir/etc/pam.d/other
-  # build pam_unix2 module
-  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
-  cd $srcdir/pam_unix2-2.6
-  ./configure
-  make
-  make DESTDIR=$pkgdir install
-  # add the realtime permissions for audio users
-  sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
-  cat >>$pkgdir/etc/security/limits.conf <<_EOT
-*               -       rtprio          0
-*               -       nice            0
-@audio          -       rtprio          65
-@audio          -       nice           -10
-@audio          -       memlock         40000
-_EOT
-  # fix some missing symlinks from old pam for compatibility
-  cd $pkgdir/lib/security
-  ln -s pam_unix.so pam_unix_acct.so
-  ln -s pam_unix.so pam_unix_auth.so
-  ln -s pam_unix.so pam_unix_passwd.so
-  ln -s pam_unix.so pam_unix_session.so
-  # set unix_chkpwd uid
-  chmod +s $pkgdir/sbin/unix_chkpwd
-}
-md5sums=('927ee5585bdec5256c75117e9348aa47'
-         'e2788389a6c59224110a45fcff30e02b'
-         '6e6c8719e5989d976a14610f340bd33a')
diff --git a/staging/pam/other b/staging/pam/other
deleted file mode 100644
index 08498b423..000000000
--- a/staging/pam/other
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
diff --git a/staging/pam/pam.install b/staging/pam/pam.install
deleted file mode 100644
index 9d4588084..000000000
--- a/staging/pam/pam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  # need to run this immediately -- pacman only runs it at the end of
-  # all package installs
-  /sbin/ldconfig -r .
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/staging/patchage/PKGBUILD b/staging/patchage/PKGBUILD
deleted file mode 100644
index b4294b173..000000000
--- a/staging/patchage/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63005 2012-01-30 12:09:14Z arodseth $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com>
-# Contributor: clarence <catchfire at gmail dot com>
-pkgname=patchage
-pkgver=0.5.0
-pkgrel=3
-pkgdesc="A modular patch bay for audio and MIDI systems"
-arch=('i686' 'x86_64')
-url="http://drobilla.net/software/patchage"
-license=('GPL')
-depends=('dbus-glib' 'libglademm' 'hicolor-icon-theme'
-         'raul' 'flowcanvas<1.0.0' 'jack')
-makedepends=('boost' 'python2')
-install=$pkgname.install
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-sha256sums=('9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf --destdir="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/patchage/patchage.install b/staging/patchage/patchage.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/staging/patchage/patchage.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/pekwm/PKGBUILD b/staging/pekwm/PKGBUILD
deleted file mode 100644
index 68cba0015..000000000
--- a/staging/pekwm/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 147166 2012-01-23 20:22:29Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Eddie Lozon <almostlucky@attbi.com>
-
-pkgname=pekwm
-pkgver=0.1.13
-pkgrel=2
-pkgdesc="A small, fast, functional, and flexible window manager"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://pekwm.org/"
-depends=('gcc-libs' 'libjpeg>=7' 'libpng' 'libxft' 'libxinerama' 'libxpm'
-'libxrandr')
-backup=(etc/pekwm/config
-  etc/pekwm/vars
-  etc/pekwm/autoproperties
-  etc/pekwm/start
-  etc/pekwm/keys
-  etc/pekwm/mouse
-  etc/pekwm/menu)
-source=(http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2
-pekwm.desktop libpng-1.4.patch)
-md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5'
-         '075bf1b9d32bf94780329499e4fa40e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -p1 < ../libpng-1.4.patch || return 1
-  # Default settings:
-  #    --enable-shape --enable-xinerama --enable-menus \
-  #    --enable-harbour --disable-debug --disable-pedantic \
-  #    --enable-xft --enable-image-xpm --enable-image-jpeg \
-  #    --enable-image-png --enable-xrandr
-  ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-                   "${pkgdir}/usr/share/xsessions/${pkgname}.desktop"
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/pekwm/libpng-1.4.patch b/staging/pekwm/libpng-1.4.patch
deleted file mode 100644
index bc4df2c4d..000000000
--- a/staging/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/staging/pekwm/pekwm.desktop b/staging/pekwm/pekwm.desktop
deleted file mode 100644
index 2f59528bd..000000000
--- a/staging/pekwm/pekwm.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pekwm
-Comment=The pekwm window manager
-Exec=pekwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD
deleted file mode 100644
index 5e195a545..000000000
--- a/staging/perl-tk/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146993 2012-01-20 05:40:57Z eric $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
-# Contributor: Jason Chu <jchu@xentac.net>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=perl-tk
-_cpanname=Tk
-pkgver=804.030
-pkgrel=2
-pkgdesc="A graphical user interface toolkit for Perl"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_cpanname}"
-license=('PerlArtistic' 'GPL' 'custom')
-depends=('libpng' 'libjpeg' 'tk' 'perl')
-options=('!emptydirs')
-replaces=('perltk')
-provides=('perltk')
-source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('13275e85f99ee467a86d9598a437abff')
-
-build() {
-  cd "$srcdir/${_cpanname}-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-#check() {
-#  cd "$srcdir/${_cpanname}-$pkgver"
-#  make test
-#}
-
-package() {
-  cd "$srcdir/${_cpanname}-$pkgver"
-  make install DESTDIR="$pkgdir"
-
-  # license
-  install -D -m644 pTk/license.terms \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
-  install -D -m644 pTk/Tix.license \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
-}
diff --git a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
deleted file mode 100644
index 1404460df..000000000
--- a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
----
- .../lib/ExtUtils/CBuilder/Base.pm                  |    6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t                 |   25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
--  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
--  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index c3bf6b5..1bb15aa 100644
---- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
--- 
-1.7.4.4
-
diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog
deleted file mode 100644
index 9add39e20..000000000
--- a/staging/perl/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2011-06-22 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS
-    * Fixed #FS22197, FS#22441, FS#24767
-    * Rebuilt perl 5.14.1-2 against db 5.2.28
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Fixed #FS24660
-    * Rebuilt against db 5.2.28
-
-2011-05-16  Angel Velasquez <angvp@archlinux.org>
-    * perl 5.14.0
-    * Removed patch for h2ph warning from 5.12.3
-    * Removed provides array, you can use corelist -v 5.14.0 to know the
-    modules included with the perl core, through Module::CoreList (thx j3nnn1
-    for the tip)
-
-2010-11-07  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.2-1
-    - Using /usr/bin/*_perl for script directories
-
-2010-11-06  kevin  <kevin@archlinux.org>
-
-    - Removed otherlibdirs directive from Configure
-    - Removed /usr/*/perl5/site_perl/5.10.1 from INC
-    - Finally removed legacy dirs /usr/lib/perl5/current and
-      /usr/lib/perl5/site_perl/current from @INC
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-2
-    - Francois updated the provides array.
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-1
-
-2010-05-16  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-2
-
-2010-05-12  kevin  <kevin@archlinux.org>
-
-    - FS#19411.  Removed the for loop in perlbin.sh which didn't work on zsh.
-      This makes the loop variables unnecessary so the script no longer
-      pollutes the user's environment.
-    - FS#19427.  Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
-      user built modules.
-
-2010-05-09  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-1
-    - Modified perlbin.sh to only add existing dirs to PATH.  Fixes FS#17402,
-      path points to non-existant directories 
-
-2010-05-07  kevin  <kevin@archlinux.org>
-
-    - Added this changelog.
-    - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC.
-      This removes the duplicates and versioned directory entries.
-    - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
-      Fix FS#13808, binaries don't follow FHS.
-    - Stopped using versioned directories in sitelib and sitearch.
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD
deleted file mode 100644
index 85fecb1d9..000000000
--- a/staging/perl/PKGBUILD
+++ /dev/null
@@ -1,117 +0,0 @@
-# $Id: PKGBUILD 145893 2012-01-03 21:13:07Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: kevin <kevin.archlinux.org>
-# Contributor: judd <jvinet.zeroflux.org>
-# Contributor: francois <francois.archlinux.org> 
-pkgname=perl
-pkgver=5.14.2
-pkgrel=6
-pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
-perlbin.sh
-perlbin.csh
-provides.pl
-0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
-install=perl.install
-options=('makeflags' '!purge')
-md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
-         '5ed2542fdb9a60682f215bd33701e61a'
-         '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '31fc0b5bb4935414394c5cfbec2cb8e5'
-         'c25d86206d649046538c3daab7874564')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    # for x86_64
-    arch_opts="-Dcccdlflags='-fPIC'"
-  else 
-    # for i686
-    arch_opts=""
-  fi
-
-  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
-    -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
-    -Dprivlib=/usr/share/perl5/core_perl \
-    -Darchlib=/usr/lib/perl5/core_perl \
-    -Dsitelib=/usr/share/perl5/site_perl \
-    -Dsitearch=/usr/lib/perl5/site_perl \
-    -Dvendorlib=/usr/share/perl5/vendor_perl \
-    -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dscriptdir=/usr/bin/core_perl \
-    -Dsitescript=/usr/bin/site_perl \
-    -Dvendorscript=/usr/bin/vendor_perl \
-    -Dinc_version_list=none \
-    -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \
-    -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}"
-  patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
-#  make test
-}
-
-package() {
-  # hack to work around makepkg running the subshell in check_sanity()
-  new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
-  provides=(${new_provides[@]})
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install
-
-  ### Perl Settings ###
-  # Change man page extensions for site and vendor module builds.
-  # Use archlinux email address instead of my own.
-  sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
-      -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
-      -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
-      -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
-
-  ### CPAN Settings ###
-  # Set CPAN default config to use the site directories.
-  sed -e '/(makepl_arg =>/   s/""/"INSTALLDIRS=site"/' \
-      -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
-
-  ### CPANPLUS Settings ###
-  # Set CPANPLUS default config to use the site directories.
-  sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
-      -e "/{'buildflags'}/     s/'';/'installdirs=site';/" \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
-
-  # Profile script to set paths to perl scripts.
-  install -D -m755 ${srcdir}/perlbin.sh \
-                   ${pkgdir}/etc/profile.d/perlbin.sh
-  # Profile script to set paths to perl scripts on csh. (FS#22441) 
-  install -D -m755 ${srcdir}/perlbin.csh \
-                  ${pkgdir}/etc/profile.d/perlbin.csh
-
-  (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
-  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct; ln -sf s2p psed)
-  grep -Rl "${pkgdir}" ${pkgdir}/usr | \
-      xargs sed -i "s^${pkgdir}^^g"
-
-  # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
-  # (FS#16488)
-  rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
-  for d in $pkgdir/usr/share/perl5/core_perl/*; do
-    if [ -d $d -a $(basename $d) != "pod" ]; then
-      find $d -name *.pod -delete
-    fi
-  done
-  find $pkgdir/usr/lib -name *.pod -delete
-  find $pkgdir -name .packlist -delete
-  # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) 
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf
-}
diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch
deleted file mode 100644
index a2d176ec6..000000000
--- a/staging/perl/fix-h2ph-and-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker@cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH 1/1] Fix h2ph and test
-
----
- lib/h2ph.t    |   12 ++++++++++--
- utils/h2ph.PL |   28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
-     exit 0;
- }
- 
--plan(4);
-+plan(5);
- 
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
-                    stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
- 
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+                   switches => ['-c'],
-+                   stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"], 
--                   prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+                   stderr => 1,
-+                   prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
- 
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
- 
- sub expr {
--    $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+    if (/\b__asm__\b/) {	# freak out
-+	$new = '"(assembly code)"';
-+	return
-+    }
-     my $joined_args;
-     if(keys(%curargs)) {
- 	$joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
-     # Increment $VERSION every time this function is modified:
--    my $VERSION     = 2;
-+    my $VERSION     = 3;
-     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
- 
-     # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- 		# parenthesized value:  d=(v)
- 		$define{$_} = $1;
- 	    }
--	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+	    if (/^(\w+)\((\w)\)$/) {
-+		my($macro, $arg) = ($1, $2);
-+		my $def = $define{$_};
-+		$def =~ s/$arg/\$\{$arg\}/g;
-+		print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+	    } elsif
-+		($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- 		# float:
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
- 	    } elsif ($define{$_} =~ /^\w+$/) {
--		print PREAMBLE
--		    "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+		my $def = $define{$_};
-+		if ($isatype{$def}) {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+		} else {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+	        }
- 	    } else {
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { \"",
--- 
-1.6.5.2.74.g610f9.dirty
-
diff --git a/staging/perl/perl.install b/staging/perl/perl.install
deleted file mode 100644
index a355c5bbe..000000000
--- a/staging/perl/perl.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
-    [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
-    [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
-    [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
-  done
-  return 0
-}
-
diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh
deleted file mode 100644
index 535f0b18d..000000000
--- a/staging/perl/perlbin.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh
deleted file mode 100755
index 20f830436..000000000
--- a/staging/perl/perlbin.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl
-
-export PATH
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
-
diff --git a/staging/perl/provides.pl b/staging/perl/provides.pl
deleted file mode 100644
index 3bf369577..000000000
--- a/staging/perl/provides.pl
+++ /dev/null
@@ -1,286 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl.
-#
-# Justin Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
-    my ($path, $mod) = @_;
-    $mod ||= "";
-
-    open my $fh, '<', $path or die "open $path: $!";
-
-    while (<$fh>) {
-        next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/;
-        my $ver = eval $1;
-        return $ver unless $@;
-        warn qq{$path:$. bad version string "$ver"\n};
-    }
-
-    close $fh;
-    return undef;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
-    my ($dist, $dir) = @_;
-
-    # libpath is the modern style, installing modules under lib/
-    # with dirs matching the name components.
-    my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
-    # dumbpath is an old style where there's no subdirs and just
-    # a .pm file.
-    my $dumbpath = $dist;
-    $dumbpath =~ s/\A.+-//;
-    $dumbpath .= ".pm";
-
-    my @paths = ($libpath, $dumbpath);
-    # Some modules (with simple names like XSLoader, lib, etc) are
-    # generated by Makefile.PL. Search through their generating code.
-    push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
-    for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
-    return undef;
-}
-
-sub module_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = maindistfile($dist, $dir) or return undef;
-
-    my $mod = $dist;
-    $mod =~ s/-/::/g;
-    my $ver = Common::evalver($path, $mod);
-    unless ($ver) {
-        warn "failed to find version in module file for $dist\n";
-        return undef;
-    }
-
-    return $ver;
-}
-
-sub changelog_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path;
-    for my $tmp (glob "$dir/{Changes,ChangeLog}") {
-        if (-f $tmp) { $path = $tmp; last; }
-    }
-    return undef unless $path;
-
-    open my $fh, '<', $path or die "open: $!";
-    while (<$fh>) {
-        return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
-        return $1 if /\A\s*version\s+([0-9._]+)/i;
-    }
-    close $fh;
-
-    return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = "$dir/VERSION";
-    return undef unless -f $path; # no warning, only podlaters has it
-
-    return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
-    my ($distroot) = @_;
-    opendir my $cpand, "$distroot" or die "failed to open $distroot";
-    my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
-    closedir $cpand;
-
-    my @found;
-    for my $dist (@dists) {
-        my $distdir = "$distroot/$dist";
-        my $ver = (module_ver($dist, $distdir)
-                   || changelog_ver($dist, $distdir)
-                   || verfile_ver($dist, $distdir));
-
-        if ($ver) { push @found, [ $dist, $ver ]; }
-        else { warn "failed to find version for $dist\n"; }
-    }
-    return @found;
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
-    my ($module) = @_;
-    my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module";
-    my $http = HTTP::Tiny->new;
-    my $resp = $http->get($url);
-    return undef unless $resp->{'success'};
-
-    my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
-        or return undef;
-
-    my $dist = $cpanpath;
-    $dist =~ s{\A.+/}{};    # remove author directory
-    $dist =~ s{-[^-]+\z}{}; # remove version and extension
-    return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    my $libdir = "$srcdir/lib/";
-    die "failed to find $libdir directory" unless -d $libdir;
-
-    # Find only the module files that have not changed since perl
-    # was extracted. We don't want the files perl just recently
-    # installed into lib/. We processed those already.
-    my @modfiles;
-    my $finder = sub {
-        return unless /[.]pm\z/;
-        push @modfiles, $_;
-    };
-    findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
-    # First we have to find what the oldest ctime actually is.
-    my $oldest = time;
-    @modfiles = map {
-        my $modfile = $_;
-        my $ctime = (stat $modfile)->ctime;
-        $oldest = $ctime if $ctime < $oldest;
-        [ $modfile, $ctime ]; # save ctime for later
-    } @modfiles;
-
-    # Then we filter out any file that was created more than a
-    # few seconds after that. Process the rest.
-    my @mods;
-    for my $modfile (@modfiles) {
-        my ($mod, $ctime) = @$modfile;
-        next if $ctime - $oldest > 5; # ignore newer files
-
-        my $path = $mod;
-        $mod =~ s{[.]pm\z}{};
-        $mod =~ s{\A$libdir}{};
-        $mod =~ s{/}{::}g;
-
-        my $ver = Common::evalver($path) || q{};
-        push @mods, [ $mod, $ver ];
-    }
-
-    # Convert modules names to the dist names who provide them.
-    my %seen;
-    my @dists;
-    for my $modref (@mods) {
-        my ($mod, $ver) = @$modref;
-        my $dist = cpan_provider($mod) or next; # filter out core modules
-        next if $seen{$dist}++;                 # avoid duplicate dists
-        push @dists, [ $dist, $ver ];
-    }
-    return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
-    my ($name) = @_;
-    my $orig = $name;
-
-    # Package names should be lowercase and consist of alphanumeric
-    # characters only (and hyphens!)...
-    $name =~ tr/A-Z/a-z/;
-    $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
-    $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
-    $name =~ tr/-/-/s;
-
-    # Delete leading or trailing hyphens...
-    $name =~ s/\A-|-\z//g;
-
-    die qq{Dist. name '$orig' completely violates packaging standards}
-        unless $name;
-
-    return "perl-$name";
-}
-
-sub version
-{
-    my ($version) = @_;
-
-    # Package versions should be numbers and decimal points only...
-    $version =~ tr/-/./;
-    $version =~ tr/_0-9.-//cd;
-
-    # Remove developer versions because pacman has no special logic
-    # to compare them to regular versions like perl does.
-    $version =~ s/_[^_]+\z//;
-
-    $version =~ tr/_//d;  # delete other underscores
-    $version =~ tr/././s; # only one period at a time
-    $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
-    return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
-                'Text-Tabs' => 'Text-Tabs+Wrap',
-                'Cwd'       => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
-    my $name = $dist->[0];
-    $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
-    my ($name, $ver) = @$_;
-    $name = Dist2Pkg::name($name);
-    $ver  = Dist2Pkg::version($ver);
-    [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
-    my ($name, $ver) = @$pkg;
-    print "$name=$ver\n";
-}
diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD
deleted file mode 100644
index baced205a..000000000
--- a/staging/php/PKGBUILD
+++ /dev/null
@@ -1,365 +0,0 @@
-# $Id: PKGBUILD 146829 2012-01-18 19:53:06Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=php
-pkgname=('php'
-         'php-cgi'
-         'php-apache'
-         'php-fpm'
-         'php-embed'
-         'php-pear'
-         'php-enchant'
-         'php-gd'
-         'php-intl'
-         'php-ldap'
-         'php-mcrypt'
-         'php-mssql'
-         'php-odbc'
-         'php-pgsql'
-         'php-pspell'
-         'php-snmp'
-         'php-sqlite'
-         'php-tidy'
-         'php-xsl')
-pkgver=5.3.9
-_suhosinver=5.3.9-0.9.10
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
-             'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
-             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
-             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm')
-md5sums=('dd3288ed5c08cd61ac5bf619cb357521'
-         'c099b3d7eac95018ababd41ded7f3066'
-         'c15d18f846be1d69144a5d0056ee6506'
-         'ffc338e8ce2a990f6f2a486355bbab65'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'b01be5f816988fcee7e78225836e5e27'
-         '740ec5fe2ecfd9d7febd4081c90ec65b'
-         '07c4e412909ac65a44ec90e7a2c4bade')
-
-build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
-		--prefix=/usr \
-		--sysconfdir=/etc/php \
-		--localstatedir=/var \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/php \
-		--with-config-file-scan-dir=/etc/php/conf.d \
-		--enable-inline-optimization \
-		--disable-debug \
-		--disable-rpath \
-		--disable-static \
-		--enable-shared \
-		--mandir=/usr/share/man \
-		--without-pear \
-		"
-
-	phpextensions="--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-dba=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-gd-native-ttf \
-		--enable-intl=shared \
-		--enable-json=shared \
-		--enable-mbregex \
-		--enable-mbstring \
-		--enable-pdo \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-session \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sqlite-utf8 \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-xml \
-		--enable-zip=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=shared,/usr \
-		--with-gd=shared \
-		--with-gdbm=shared \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-icu-dir=/usr \
-		--with-imap-ssl=shared \
-		--with-imap=shared \
-		--with-jpeg-dir=shared,/usr \
-		--with-ldap=shared \
-		--with-ldap-sasl \
-		--with-mcrypt=shared \
-		--with-mhash \
-		--with-mssql=shared \
-		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
-		--with-mysql=shared,mysqlnd \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl=shared \
-		--with-pcre-regex=/usr \
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,/usr \
-		--with-pdo-pgsql=shared \
-		--with-pdo-sqlite=shared,/usr \
-		--with-pgsql=shared \
-		--with-png-dir=shared,/usr \
-		--with-pspell=shared \
-		--with-regex=php \
-		--with-snmp=shared \
-		--with-sqlite3=shared,/usr \
-		--with-sqlite=shared \
-		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
-		--with-xmlrpc=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		--without-db2 \
-		--without-db3 \
-		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
-	# adjust paths
-	patch -p0 -i ${srcdir}/php.ini.patch
-	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
-	# php
-	mkdir ${srcdir}/build-php
-	cd ${srcdir}/build-php
-	ln -s ../${pkgbase}-${pkgver}/configure
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		${phpextensions}
-	make
-
-	# cgi and fcgi
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
-	cd ${srcdir}/build-cgi
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-cgi \
-		${phpextensions}
-	make
-
-	# apache
-	cp -a ${srcdir}/build-php ${srcdir}/build-apache
-	cd ${srcdir}/build-apache
-	./configure ${phpconfig} \
-		--disable-cli \
-		--with-apxs2 \
-		${phpextensions}
-	make
-
-	# fpm
-	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
-	cd ${srcdir}/build-fpm
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
-		${phpextensions}
-	make
-
-	# embed
-	cp -a ${srcdir}/build-php ${srcdir}/build-embed
-	cd ${srcdir}/build-embed
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-embed=shared \
-		${phpextensions}
-	make
-
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${phpextensions}
-	make
-}
-
-# check() {
-# 	cd ${srcdir}/build-php
-# 	make test
-# }
-
-package_php() {
-	pkgdesc='An HTML-embedded scripting language'
-	depends=('pcre' 'libxml2' 'bzip2' 'curl')
-	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
-	provides=('php-fileinfo' 'php-gmp' 'php-curl')
-	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
-	backup=('etc/php/php.ini')
-
-	cd ${srcdir}/build-php
-	make -j1 INSTALL_ROOT=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/pear
-	# install php.ini
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
-	install -d -m755 ${pkgdir}/etc/php/conf.d/
-
-	# remove static modules
-	rm -f ${pkgdir}/usr/lib/php/modules/*.a
-	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
-	# remove empty directory
-	rmdir ${pkgdir}/usr/include/php/include
-}
-
-package_php-cgi() {
-	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
-}
-
-package_php-apache() {
-	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache')
-	backup=('etc/httpd/conf/extra/php5_module.conf')
-
-	install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
-}
-
-package_php-fpm() {
-	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php')
-	backup=('etc/php/php-fpm.conf')
-
-	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
-	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
-	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
-	install -d -m755 ${pkgdir}/etc/php/fpm.d
-}
-
-package_php-embed() {
-	pkgdesc='Embed SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
-}
-
-package_php-pear() {
-	pkgdesc='PHP Extension and Application Repository'
-	depends=('php')
-	backup=('etc/php/pear.conf')
-
-	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
-}
-
-package_php-enchant() {
-	depends=('php' 'enchant')
-	pkgdesc='enchant module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
-}
-
-package_php-gd() {
-	depends=('php' 'libpng' 'libjpeg' 'freetype2')
-	pkgdesc='gd module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
-}
-
-package_php-intl() {
-	depends=('php' 'icu')
-	pkgdesc='intl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
-}
-
-package_php-ldap() {
-	depends=('php' 'libldap')
-	pkgdesc='ldap module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
-}
-
-package_php-mcrypt() {
-	depends=('php' 'libmcrypt' 'libltdl')
-	pkgdesc='mcrypt module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
-}
-
-package_php-mssql() {
-	depends=('php' 'freetds')
-	pkgdesc='mssql module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
-}
-
-package_php-odbc() {
-	depends=('php' 'unixodbc')
-	pkgdesc='ODBC modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
-}
-
-package_php-pgsql() {
-	depends=('php' 'postgresql-libs')
-	pkgdesc='PostgreSQL modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
-}
-
-package_php-pspell() {
-	depends=('php' 'aspell')
-	pkgdesc='pspell module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
-}
-
-package_php-snmp() {
-	depends=('php' 'net-snmp')
-	pkgdesc='snmp module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
-}
-
-package_php-sqlite() {
-	depends=('php' 'sqlite3')
-	pkgdesc='sqlite3 module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
-}
-
-package_php-tidy() {
-	depends=('php' 'tidyhtml')
-	pkgdesc='tidy module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
-}
-
-package_php-xsl() {
-	depends=('php' 'libxslt')
-	pkgdesc='xsl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
-}
diff --git a/staging/php/apache.conf b/staging/php/apache.conf
deleted file mode 100644
index c3ca0aad5..000000000
--- a/staging/php/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
-	<IfModule php5_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm
deleted file mode 100644
index 7a1ba2597..000000000
--- a/staging/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	postrotate
-	/etc/rc.d/php-fpm logrotate >/dev/null || true
-	endscript
-}
diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch
deleted file mode 100644
index b923edb38..000000000
--- a/staging/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
- 
- ; Error log file
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -140,7 +140,8 @@
- ;                            specific port;
- ;   '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -151,9 +152,9 @@
- ; BSD-derived systems allow connections regardless of permissions. 
- ; Default Values: user and group are set as the running user
- ;                 mode is set to 0666
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0666
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
-  
- ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -442,7 +443,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch
deleted file mode 100644
index 3dc5b6560..000000000
--- a/staging/php/php.ini.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- php.ini-production	2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
- ; or per-virtualhost web server configuration file. This directive is
- ; *NOT* affected by whether Safe Mode is turned On or Off.
- ; http://php.net/open-basedir
--;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
- 
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
- 
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
- ; On windows:
- ; extension_dir = "ext"
- 
-@@ -950,53 +950,49 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
- ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--;
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll      ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed. 
--; See http://www.php.net/manual/en/snmp.installation.php 
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+extension=json.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysqli.so
-+;extension=mysql.so
-+;extension=odbc.so
-+;extension=openssl.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sqlite.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+;extension=zip.so
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm
deleted file mode 100644
index 54bcf4d5b..000000000
--- a/staging/php/rc.d.php-fpm
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
-	try=0
-	while test $try -lt 35 ; do
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		stat_append '.'
-		try=`expr $try + 1`
-		sleep 1
-	done
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/php/php-fpm.conf ]; then
-		stat_append '(/etc/php/php-fpm.conf not found)'
-		stat_die
-	fi
-
-	local test=$(/usr/sbin/php-fpm -t 2>&1)
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/php/php-fpm.conf)'
-		stat_die
-	elif echo $test | grep -qi 'error'; then
-		stat_append '(error in /etc/php/php.ini)'
-		stat_die
-	fi
-
-	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			add_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	stop)
-		test_config
-		stat_busy 'Gracefully shutting down php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	force-quit)
-		stat_busy 'Terminating php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	restart)
-		$0 stop
-		$0 start
-	;;
-
-	reload)
-		test_config
-		stat_busy 'Reload service php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	logrotate)
-		stat_busy 'Reopen php-fpm log'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	*)
-		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
-		exit 1
-	;;
-
-esac
diff --git a/staging/pilot-link/PKGBUILD b/staging/pilot-link/PKGBUILD
deleted file mode 100644
index 28fa36618..000000000
--- a/staging/pilot-link/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147174 2012-01-23 21:43:03Z eric $
-# Maintainer: dale <dale@archlinux.org>
-
-# todo: add perl support, DESTDIR has no affect on perl
-# and it seems that moving the files manually doesn't work
-
-pkgname=pilot-link
-pkgver=0.12.5
-pkgrel=3
-pkgdesc="A suite of tools for connecting to PalmOS handheld devices"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('readline>=6.0' 'libpng>=1.5.0' 'libusb-compat' 'popt' 'bluez>=4.59')
-options=('!libtool')
-url="http://www.pilot-link.org/"
-source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2
-        pilot-link-png14.patch)
-md5sums=('568c55bf504b044f6fbd50baa407c990'
-         'a21a2eeb01544a8a261a75e64a3120c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/pilot-link-png14.patch"
-  ./configure --prefix=/usr --enable-conduits --enable-libusb \
-    --with-libiconv --with-libpng
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pilot-link/pilot-link-png14.patch b/staging/pilot-link/pilot-link-png14.patch
deleted file mode 100644
index 9d753332e..000000000
--- a/staging/pilot-link/pilot-link-png14.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c
---- pilot-link-0.12.4/src/pilot-read-notepad.c	2007-02-05 00:06:02.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c	2010-01-17 15:04:33.000000000 +0100
-@@ -39,10 +39,6 @@
- 
- #ifdef HAVE_PNG
- #include "png.h"
--#if (PNG_LIBPNG_VER < 10201)
-- #define png_voidp_NULL (png_voidp)NULL
-- #define png_error_ptr_NULL (png_error_ptr)NULL
--#endif
- #endif
- 
- const char *progname;
-@@ -166,8 +162,8 @@
-    width = n->body.width + 8;
- 
-    png_ptr = png_create_write_struct
--     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--       png_error_ptr_NULL, png_error_ptr_NULL);
-+     ( PNG_LIBPNG_VER_STRING, NULL,
-+       NULL, NULL);
- 
-    if(!png_ptr)
-      return;
-diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c
---- pilot-link-0.12.4/src/pilot-read-palmpix.c	2007-02-05 00:06:03.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c	2010-01-17 15:03:20.000000000 +0100
-@@ -42,10 +42,6 @@
- 
- #ifdef HAVE_PNG
- #include "png.h"
--#if (PNG_LIBPNG_VER < 10201)
-- #define png_voidp_NULL (png_voidp)NULL
-- #define png_error_ptr_NULL (png_error_ptr)NULL
--#endif
- #endif
- 
- const char *progname;
-@@ -223,8 +219,8 @@
- 	png_infop info_ptr;
- 
- 	png_ptr = png_create_write_struct
--		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--		png_error_ptr_NULL, png_error_ptr_NULL);
-+		( PNG_LIBPNG_VER_STRING, NULL,
-+		NULL, NULL);
- 
- 	if(!png_ptr)
- 		return;
-diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c
---- pilot-link-0.12.4/src/pilot-read-screenshot.c	2006-11-02 15:54:31.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c	2010-01-17 15:03:52.000000000 +0100
-@@ -40,10 +40,6 @@
- 
- #ifdef HAVE_PNG
- # include "png.h"
--# if (PNG_LIBPNG_VER < 10201)
--#  define png_voidp_NULL (png_voidp)NULL
--#  define png_error_ptr_NULL (png_error_ptr)NULL
--# endif
- #endif
- 
- #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
-@@ -87,8 +83,8 @@
- 		gray_buf = malloc( state->w );
- 
- 	png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--		png_error_ptr_NULL, png_error_ptr_NULL);
-+		(PNG_LIBPNG_VER_STRING, NULL,
-+		NULL, NULL);
- 
- 	if (!png_ptr)
- 		return;
-diff -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c
---- pilot-link-0.12.4/src/pilot-read-veo.c	2007-02-05 00:06:03.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-veo.c	2010-01-17 15:04:14.000000000 +0100
-@@ -41,10 +41,6 @@
- 
- #ifdef HAVE_PNG
- # include "png.h"
--# if (PNG_LIBPNG_VER < 10201)
--#  define png_voidp_NULL (png_voidp)NULL
--#  define png_error_ptr_NULL (png_error_ptr)NULL
--# endif
- #endif
- 
- #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
-@@ -856,8 +852,8 @@
-    png_infop info_ptr;
- 
-    png_ptr = png_create_write_struct
--	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--	  png_error_ptr_NULL, png_error_ptr_NULL);
-+	 (PNG_LIBPNG_VER_STRING, NULL,
-+	  NULL, NULL);
- 
-    if (!png_ptr)
- 	 return;
diff --git a/staging/plotutils/PKGBUILD b/staging/plotutils/PKGBUILD
deleted file mode 100644
index 14d4c736e..000000000
--- a/staging/plotutils/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147686 2012-01-27 01:31:15Z eric $
-# Maintainer: damir <damir@archlinux.org>
-# Packager: Maksim Sipos (maxsipos at gmail dot com)
-
-pkgname=plotutils
-pkgver=2.6
-pkgrel=2
-arch=('x86_64' 'i686')
-pkgdesc="Set of utilities and libraries for plotting."
-url="http://directory.fsf.org/graphics/plotutils.html"
-license=("GPL")
-depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
-options=('!libtool')
-install=plotutils.install
-source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch)
-sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
-          '426f6ee04186af5059ab54322efaf0a6a976682b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../plotutils-2.6-libpng-1.5.patch
-  ./configure --prefix=/usr \
-	--with-gnu-ld \
-	--with-x \
-	--enable-libplotter
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/plotutils/plotutils-2.6-libpng-1.5.patch b/staging/plotutils/plotutils-2.6-libpng-1.5.patch
deleted file mode 100644
index b86d9f457..000000000
--- a/staging/plotutils/plotutils-2.6-libpng-1.5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fix building with libpng-1.5
-
---- libplot/z_write.c
-+++ libplot/z_write.c
-@@ -164,7 +164,7 @@
-     }
- 
-   /* cleanup after libpng errors (error handler does a longjmp) */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (png_jmpbuf (png_ptr))
-     {
-       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
-       return -1;
-@@ -444,7 +444,7 @@
- #endif
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
- }
- 
- static void 
-@@ -515,7 +515,7 @@
- #endif
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
- }
- 
- static void 
diff --git a/staging/plotutils/plotutils.install b/staging/plotutils/plotutils.install
deleted file mode 100644
index d3d033e0c..000000000
--- a/staging/plotutils/plotutils.install
+++ /dev/null
@@ -1,15 +0,0 @@
-infodir=usr/share/info
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD
deleted file mode 100644
index d05f4945e..000000000
--- a/staging/poppler/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 147129 2012-01-22 11:12:11Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.3
-pkgrel=2
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://poppler.freedesktop.org/"
-_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
-        git-fixes.patch)
-md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4'
-         '9dc64c254a31e570507bdd4ad4ba629a'
-         'af56b7b1b24a08f7498a0c7f5e862b93')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-cairo-output \
-      --enable-xpdf-headers \
-      --enable-libjpeg --enable-zlib \
-      --enable-poppler-qt4 \
-      --enable-poppler-glib
-  make
-}
-
-check() {
-  cd "${srcdir}"
-  ln -sf test-${_testtag} test
-  cd ${pkgbase}-${pkgver}
-  LANG=en_US.UTF8 make check
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'glib2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/staging/poppler/git-fixes.patch b/staging/poppler/git-fixes.patch
deleted file mode 100644
index 24a66b84f..000000000
--- a/staging/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/staging/postfix/PKGBUILD b/staging/postfix/PKGBUILD
deleted file mode 100644
index 544a08df3..000000000
--- a/staging/postfix/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 145787 2012-01-01 01:35:49Z bisson $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.8.7
-pkgrel=2
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
-        'aliases.patch' \
-        'rc.d')
-sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make makefiles DEBUG='' CCARGS=' \
-		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
-		-DHAS_LDAP \
-		-DUSE_TLS \
-		-DHAS_MYSQL -I/usr/include/mysql \
-		-DHAS_PGSQL -I/usr/include/postgresql \
-		-DHAS_SQLITE \
-	' AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
-		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
-	' OPT="${CFLAGS} ${LDFLAGS}"
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man"
-
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	cd "${pkgdir}"
-	patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/staging/postfix/aliases.patch b/staging/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/staging/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig	2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf	2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/staging/postfix/install b/staging/postfix/install
deleted file mode 100644
index c276e0919..000000000
--- a/staging/postfix/install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
-	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
-	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
-	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
-
-==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because of an inter-daemon protocol change.
-
-EOF
-	fi
-}
-
-pre_remove() {
-	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
-	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
-	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/staging/postfix/rc.d b/staging/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/staging/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/staging/pygtk/PKGBUILD b/staging/pygtk/PKGBUILD
deleted file mode 100644
index a231b87ef..000000000
--- a/staging/pygtk/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 147168 2012-01-23 21:15:41Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=pygtk
-pkgver=2.24.0
-pkgrel=3
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python2-numpy' 'pygobject2-devel')
-optdepends=('python2-numpy')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        python27.patch)
-sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
-            '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=623965
-  patch -Np1 -i "${srcdir}/python27.patch"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-
-  sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py
-}
diff --git a/staging/pygtk/python27.patch b/staging/pygtk/python27.patch
deleted file mode 100644
index 9bbe2b5ae..000000000
--- a/staging/pygtk/python27.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
-index c0e1493..aa8cf10 100644
---- a/gtk/gtkmodule.c
-+++ b/gtk/gtkmodule.c
-@@ -227,8 +227,12 @@ init_gtk(void)
-     pygtk_add_stock_items(d);
-     
-     /* extension API */
--    PyDict_SetItemString(d, "_PyGtk_API",
--			 o=PyCObject_FromVoidPtr(&functions, NULL));
-+#if PY_VERSION_HEX >= 0x02070000
-+    o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
-+#else
-+    o = PyCObject_FromVoidPtr(&functions, NULL);
-+#endif
-+    PyDict_SetItemString(d, "_PyGtk_API", o);
-     Py_DECREF(o);
- 	
-     PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning",
-diff --git a/gtk/pygtk.h b/gtk/pygtk.h
-index 573c3b9..e4c680f 100644
---- a/gtk/pygtk.h
-+++ b/gtk/pygtk.h
-@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
- 
- 
- /* a function to initialise the pygtk functions */
-+
-+/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
-+#if PY_VERSION_HEX >= 0x02070000
-+#define init_pygtk() G_STMT_START { \
-+    void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
-+    if (!capsule) { \
-+        return; \
-+    } \
-+    _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
-+} G_STMT_END
-+#else /* PY_VERSION_HEX */
-+/* Python 2.6 and earlier use the CObject API */
- #define init_pygtk() G_STMT_START { \
-     PyObject *pygtk = PyImport_ImportModule("gtk"); \
-     if (pygtk != NULL) { \
-@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
-         return; \
-     } \
- } G_STMT_END
-+#endif /* PY_VERSION_HEX */
- 
- #endif
- 
diff --git a/staging/pygtksourceview2/PKGBUILD b/staging/pygtksourceview2/PKGBUILD
deleted file mode 100644
index 794456360..000000000
--- a/staging/pygtksourceview2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147214 2012-01-24 19:17:55Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pygtksourceview2
-pkgver=2.10.1
-pkgrel=4
-pkgdesc="Python bindings for gtksourceview2"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
-sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974')
-
-build() {
-  cd "${srcdir}/pygtksourceview-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-docs
-  make
-}
-
-package() {
-  cd "${srcdir}/pygtksourceview-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD
deleted file mode 100644
index b00e72a84..000000000
--- a/staging/python-notify/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 147960 2012-01-29 04:17:35Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=python-notify
-pkgver=0.1.1
-pkgrel=11
-pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
-url="http://www.galago-project.org/"
-license=('GPL')
-depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('pkgconfig' 'python2')
-options=(!libtool)
-source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
-        libnotify07.patch
-        notify-python-0.1.1-fix-GTK-symbols.patch)
-md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
-         'b40c4542575d5aef559908fe60a21634'
-         'c6922028da5951e69a6a0167bdb4461c')
-
-build() {
-    cd ${srcdir}/notify-python-${pkgver}
-
-    patch -Np1 -i ${srcdir}/libnotify07.patch
-    patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch
-
-    ./configure --prefix=/usr
-
-    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
-    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
-    touch src/pynotify.override
-
-    make clean
-    make
-}
-
-package() {
-    cd ${srcdir}/notify-python-${pkgver}
-    make DESTDIR=${pkgdir} install
-}
diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch
deleted file mode 100644
index 289573d50..000000000
--- a/staging/python-notify/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c0136..000000000
--- a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/staging/python-pygame/ChangeLog b/staging/python-pygame/ChangeLog
deleted file mode 100644
index 566be3f65..000000000
--- a/staging/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/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD
deleted file mode 100644
index 20b37e9ac..000000000
--- a/staging/python-pygame/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 147958 2012-01-29 04:08:03Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: john(?)
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=python-pygame
-pkgver=1.9.1
-pkgrel=4
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
-makedepends=('python2' 'portmidi') 
-replaces=('pygame')
-provides=('pygame')
-changelog=ChangeLog
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
-'pygame-v4l.patch')
-md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
-         'aaa668f3cd710d8604114501ea6a6f48'
-         '9915b63865c16519e80007909beed876')
-
-build() {
-	cd "${srcdir}/pygame-${pkgver}release"
-	patch -Np0 -i "${srcdir}/config.patch"
-    patch -Np1 -i "${srcdir}/pygame-v4l.patch"
-}
-
-package() {
-	cd "${srcdir}/pygame-${pkgver}release"
-	python2 config.py -auto
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-	# Copying the examples and tests
-	cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
-	cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-	# Fixing permissions
-	chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch
deleted file mode 100644
index b3dab162c..000000000
--- a/staging/python-pygame/config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: config_unix.py
-===================================================================
---- config_unix.py	(revision 2567)
-+++ config_unix.py	(working copy)
-@@ -174,7 +174,7 @@
- 
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
-Index: config_msys.py
-===================================================================
---- config_msys.py	(revision 2567)
-+++ config_msys.py	(working copy)
-@@ -283,7 +283,7 @@
-     
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch
deleted file mode 100644
index 3b5a2b9d2..000000000
--- a/staging/python-pygame/pygame-v4l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
-*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
---- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
-***************
-*** 34,40 ****
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
---- 34,40 ----
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
-diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
-*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
---- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
-***************
-*** 160,179 ****
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-!         if (v4l_open_device(self) == 0) {
-!             v4l2_close_device(self);
-!             return NULL;
-!         } else {
-!             self->camera_type = CAM_V4L;
-!             if (v4l_init_device(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!             if (v4l_start_capturing(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!         }
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
---- 160,167 ----
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-! 	v4l2_close_device(self);
-!         return NULL;
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
-diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
-*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
---- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
-***************
-*** 39,45 ****
-  
-      #include <asm/types.h>          /* for videodev2.h */
-  
--     #include <linux/videodev.h>
-      #include <linux/videodev2.h>
-  #endif
-  
---- 39,44 ----
-***************
-*** 51,57 ****
-  #define RGB_OUT 1
-  #define YUV_OUT 2
-  #define HSV_OUT 4
-- #define CAM_V4L 1
-  #define CAM_V4L2 2
-  
-  struct buffer 
---- 50,55 ----
-***************
-*** 111,118 ****
-  int v4l2_close_device (PyCameraObject* self);
-  int v4l2_open_device (PyCameraObject* self);
-  
-- /* internal functions specific to v4l */
-- int v4l_open_device (PyCameraObject* self);
-- int v4l_init_device(PyCameraObject* self);
-- int v4l_start_capturing(PyCameraObject* self);
-  #endif
---- 109,112 ----
diff --git a/staging/pywebkitgtk/PKGBUILD b/staging/pywebkitgtk/PKGBUILD
deleted file mode 100644
index 792ef185c..000000000
--- a/staging/pywebkitgtk/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 147954 2012-01-29 03:55:38Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
-# Contributor: kasa <biuta.jr@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pywebkitgtk
-pkgver=1.1.8
-pkgrel=2
-pkgdesc="Python bindings to the WebKit GTK+ port"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pywebkitgtk/"
-license=('LGPL')
-depends=('libwebkit' 'pygtk')
-options=('!libtool' '!makeflags')
-source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('158335385354ba38090c9324b37bf225')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-}
diff --git a/staging/qemu-kvm/65-kvm.rules b/staging/qemu-kvm/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/staging/qemu-kvm/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/staging/qemu-kvm/PKGBUILD b/staging/qemu-kvm/PKGBUILD
deleted file mode 100644
index f1952ae52..000000000
--- a/staging/qemu-kvm/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 148022 2012-01-30 01:45:27Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu-kvm
-pkgver=1.0
-pkgrel=3
-pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=(i686 x86_64)
-license=('GPL2' 'LGPL2.1')
-url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse')
-makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu-kvm.install
-conflicts=('qemu')
-provides=('qemu')
-replaces=('kvm')
-source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules)
-options=(!strip)
-
-build()
-{
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # fix esound building
-    ./configure --prefix=/usr \
-                --python=/usr/bin/python2 \
-                --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss,pa \
-                --audio-card-list=ac97,sb16,es1370,hda \
-                --enable-docs
-    make
-
-    # Use latest seabios version
-    # https://bugs.archlinux.org/task/27616
-    cd "${srcdir}/"
-    git clone git://git.seabios.org/seabios.git
-    cd seabios
-    find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-    make clean
-    make
-}
-
-package()
-{
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    
-    # Use latest seabios version
-    # https://bugs.archlinux.org/task/27616
-    cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
-
-    # symbolic link for backwards compatibility
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu"
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm"
-    # fix man page
-    mv "${pkgdir}/usr/share/man/man1/qemu.1" \
-                     "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
-    # install udev rules
-    install -D -m644 "${srcdir}/65-kvm.rules" \
-                     "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
-    # strip scripts directory
-    find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-}
-md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/staging/qemu-kvm/qemu-kvm.install b/staging/qemu-kvm/qemu-kvm.install
deleted file mode 100644
index 84aa773b9..000000000
--- a/staging/qemu-kvm/qemu-kvm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
-  echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu-kvm -enable-kvm' to use KVM."
-  echo ""
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  groupdel kvm
-}
diff --git a/staging/qemu/65-kvm.rules b/staging/qemu/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/staging/qemu/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/staging/qemu/PKGBUILD b/staging/qemu/PKGBUILD
deleted file mode 100644
index 4110f17ae..000000000
--- a/staging/qemu/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 148018 2012-01-30 01:00:56Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu
-pkgver=1.0
-pkgrel=3
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules)
-options=(!strip)
-
-build()
-{
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/lib64/lib/g' x86_64.ld
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
-              --python=/usr/bin/python2 \
-              --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs
-              make
-  # Use latest seabios version
-  # https://bugs.archlinux.org/task/27616
-  cd "${srcdir}/"
-  git clone git://git.seabios.org/seabios.git
-  cd seabios
-  find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-  make clean
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # Use latest seabios version
-  # https://bugs.archlinux.org/task/27616
-  cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
-
-  install -D -m644 "${srcdir}/65-kvm.rules" \
-                   "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
-  # strip scripts directory
-    find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-
-}
-md5sums=('a64b36067a191451323b0d34ebb44954'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/staging/qemu/qemu.install b/staging/qemu/qemu.install
deleted file mode 100644
index e16ac027c..000000000
--- a/staging/qemu/qemu.install
+++ /dev/null
@@ -1,24 +0,0 @@
-# kvm:  the new package version
-post_install() {
-  #
-  groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
-  echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu -enable-kvm' to use KVM."
-  echo ""
-  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
-    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
-    echo "is no longer supported and will be removed from the repositories. You"
-    echo "can safely uninstall it from your system."
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  #
-  groupdel kvm
-}
diff --git a/staging/qiv/PKGBUILD b/staging/qiv/PKGBUILD
deleted file mode 100644
index 520b5847e..000000000
--- a/staging/qiv/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 147092 2012-01-21 19:18:31Z eric $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=qiv
-pkgver=2.2.4
-pkgrel=2
-pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
-arch=('i686' 'x86_64')
-url="http://spiegl.de/qiv/"
-license=('GPL2')
-depends=('file' 'gtk2' 'imlib2')
-source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz)
-md5sums=('1425f89c90f9c045858fccf24d894c97')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m 0755 qiv "$pkgdir/usr/bin/qiv"
-  install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1"
-}
diff --git a/staging/qrencode/PKGBUILD b/staging/qrencode/PKGBUILD
deleted file mode 100644
index cfa810614..000000000
--- a/staging/qrencode/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146830 2012-01-18 19:53:58Z bluewind $
-# Maintainer: Florian Pritz< flo@xinu.at>
-# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-
-pkgname=qrencode
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="C library for encoding data in a QR Code symbol."
-arch=(i686 x86_64)
-depends=('libpng>=1.5.0')
-makedepends=(sdl)
-url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
-license=('GPL')
-options=(!libtool)
-source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7e90615eb314abcd2eb2eab5c8155b97')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-#  autoreconf
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make prefix="$pkgdir/usr" install
-}
diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD
deleted file mode 100644
index 24ae69a78..000000000
--- a/staging/qt/PKGBUILD
+++ /dev/null
@@ -1,126 +0,0 @@
-# $Id: PKGBUILD 146853 2012-01-18 20:54:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
-    'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-    'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
-    'mysql' 'unixodbc' 'cups' 'gtk2')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop')
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd')
-
-build() {
-  cd "${srcdir}"/${_pkgfqn}
-
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -importdir /usr/lib/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc} \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -graphicssystem raster \
-    -openssl-linked \
-    -nomake demos \
-    -nomake examples \
-    -nomake docs \
-    -silent \
-    -no-rpath \
-    -optimized-qmake \
-    -reduce-relocations \
-    -dbus-linked \
-    -no-openvg
-  make
-}
-
-package_qt() {
-    pkgdesc='A cross-platform application and UI framework'
-    depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
-      'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-      'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-    optdepends=('postgresql-libs: PostgreSQL driver'
-                'libmysqlclient: MySQL driver'
-                'unixodbc: ODBC driver'
-                'libxinerama: Xinerama support'
-                'libxcursor: Xcursor support'
-                'libxfixes: Xfixes support')
-    install='qt.install'
-
-    cd "${srcdir}"/${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    # install missing icons and desktop files
-    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-      size=$(echo $(basename ${icon}) | cut -d- -f2)
-      install -p -D -m644 ${icon} \
-        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
-    done
-    install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
-    install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
-      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
-    install -p -D -m644 tools/designer/src/designer/images/designer.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
-    install -d "${pkgdir}/usr/share/applications"
-    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
-      "${pkgdir}/usr/share/applications/"
-
-    # install license addition
-    install -D -m644 LGPL_EXCEPTION.txt \
-      ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
-    # Fix wrong path in pkgconfig files
-    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
-      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
-    # Fix wrong path in prl files
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
-    pkgdesc="Qt private headers for development"
-    depends=("qt=${pkgver}")
-
-    install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
-    install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-    
-    for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
-        "${pkgdir}"/usr/include/${i}/
-    done
-
-    for i in corelib declarative gui script; do
-      cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
-    done
-}
diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/staging/qt/assistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/staging/qt/designer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/staging/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/staging/qt/qt.install b/staging/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/staging/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/staging/qt3/PKGBUILD b/staging/qt3/PKGBUILD
deleted file mode 100644
index 57b052598..000000000
--- a/staging/qt3/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id: PKGBUILD 146911 2012-01-19 05:18:20Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=qt3
-pkgver=3.3.8
-pkgrel=22
-pkgdesc="The QT3 gui toolkit"
-arch=('i686' 'x86_64')
-url="http://www.trolltech.com/products/qt/index.html"
-license=('GPL')
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
-         'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2
-        qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
-        mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
-          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
-          '3d19510c46016a1a211d97bf8f82b01498b1b33c'
-          '9cb2e5bec782069692ee337cfa171539d9d73753'
-          '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
-          'ca5ecb29c7f1c826d48703339a3371038e306bb7'
-          'd928ff55adb52c4bab2fb268df022651551cd70c'
-          'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
-          '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
-          '1346320614f6f86fbeb10b9fbad721dea29f5b61'
-          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
-
-# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
-# other qt-patches come from fedora and gentoo
-
-build() {
-  unset QMAKESPEC
-  export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
-  export PATH=${QTDIR}/bin:${PATH}
-  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # apply qt patches from kde.org
-  for i in ../qt-copy-kde-patches/*; do
-    patch -Np0 -i $i 
-  done
-  # apply other qt patches and one security fix from debian/gentoo
-  for i in ../qt-patches/*; do
-    patch -Np1 -i $i 
-  done
-  # fix utf8 bug
-  patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff 
-  # fix asia fonts
-  patch -p0 -i "${srcdir}"/qt-font-default-subst.diff 
-  # fix segfaults on exit when using mysql DB driver
-  patch -p0 -i "${srcdir}"/mysql.patch 
-  # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff 
-  # fix build problem against new unixODBC
-  patch -p1 -i "${srcdir}"/qt-odbc.patch 
-  # fix build with gcc 4.6.0
-  patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
-  patch -p0 -i "${srcdir}"/qt3-png15.patch 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  rm -rf doc/html examples tutorial
-  sed -i "s|sub-tutorial sub-examples||" Makefile
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
-  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
-  sed -i "s|read acceptance|acceptance=yes|" configure
-
- # remove unwanted mkspecs
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
-  if [ "$CARCH" = "x86_64" ]; then
-      export ARCH="-64"	
-    else unset ARCH
-  fi
-
-  ./configure -prefix /opt/qt \
-    -platform linux-g++$ARCH \
-    -system-zlib \
-    -qt-gif \
-    -release \
-    -shared \
-    -sm \
-    -nis \
-    -thread \
-    -stl \
-    -system-lib{png,jpeg,mng} \
-    -no-g++-exceptions \
-    -plugin-sql-{mysql,psql,sqlite,odbc}
-
-  # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make -C qmake 
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # fix the broken makefiles
-  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make INSTALL_ROOT="${pkgdir}" install
-  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
-  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
-  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
-  # install man pages
-  install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
-
-  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
-}
diff --git a/staging/qt3/eastern_asian_languagues.diff b/staging/qt3/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/staging/qt3/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
- 
- #ifdef Q_WS_X11
-     if (script == QFont::Han) {
--	// modify script according to locale
--	static QFont::Script defaultHan = QFont::UnknownScript;
--	if (defaultHan == QFont::UnknownScript) {
--	    QCString locale = setlocale(LC_ALL, NULL);
--	    if (locale.contains("ko"))
--		defaultHan = QFont::Han_Korean;
--	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
--		defaultHan = QFont::Han_TraditionalChinese;
--	    else if (locale.contains("zh"))
--		defaultHan = QFont::Han_SimplifiedChinese;
--	    else
--		defaultHan = QFont::Han_Japanese;
--	}
--	script = defaultHan;
-+        // modify script according to locale
-+        static QFont::Script defaultHan;
-+        QCString locale = setlocale(LC_ALL, NULL);
-+
-+        if (locale.contains("ko"))
-+            defaultHan = QFont::Han_Korean;
-+        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+            defaultHan = QFont::Han_TraditionalChinese;
-+        else if (locale.contains("zh"))
-+            defaultHan = QFont::Han_SimplifiedChinese;
-+        else if (locale.contains("ja"))
-+            defaultHan = QFont::Han_Japanese;
-+        else
-+            defaultHan = QFont::Han; // don't change
-+
-+        script = defaultHan;
-     }
- #endif
- 
diff --git a/staging/qt3/gcc-4.6.patch b/staging/qt3/gcc-4.6.patch
deleted file mode 100644
index bcbffcea6..000000000
--- a/staging/qt3/gcc-4.6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-01-30 21:14:29.275088725 -0600
-@@ -49,6 +49,7 @@
- #include "qvaluelist.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <map>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-01-30 21:14:01.765846592 -0600
-@@ -47,6 +47,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-01-30 21:14:01.765846592 -0600
-@@ -45,6 +45,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <vector>
- #endif
diff --git a/staging/qt3/mysql.patch b/staging/qt3/mysql.patch
deleted file mode 100644
index 5f61edc67..000000000
--- a/staging/qt3/mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
- 
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
- 
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
--    mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
- 
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- #  endif
-     }
--    qAddPostRoutine(qServerEnd);
-     init = TRUE;    
--    
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- 	delete ext;
-     }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+    mysql_server_end();
-+# endif
-+#endif
- }
- 
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/staging/qt3/qt-copy-kde-patches.tar.bz2 b/staging/qt3/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 19d899963..000000000
--- a/staging/qt3/qt-copy-kde-patches.tar.bz2
+++ /dev/null
diff --git a/staging/qt3/qt-font-default-subst.diff b/staging/qt3/qt-font-default-subst.diff
deleted file mode 100644
index 3e286f74e..000000000
--- a/staging/qt3/qt-font-default-subst.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- 	    if (script == QFont::Latin)
- 		// add Euro character
- 		FcCharSetAddChar(cs, 0x20ac);
--	    if (script == QFont::Han_SimplifiedChinese)
--		FcCharSetAddChar(cs, 0x3400);
--	    if (script == QFont::Han_TraditionalChinese){
--		FcCharSetAddChar(cs, 0x3435);
--		FcCharSetAddChar(cs, 0xE000);
--		FcCharSetAddChar(cs, 0xF6B1);
--	    }
--	    if (script == QFont::MiscellaneousSymbols)
--		FcCharSetAddChar(cs, 0x2714);
- 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- 	    FcCharSetDestroy(cs);
- 	}
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
-     FcPatternPrint(pattern);
- #endif
- 
-+    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+    // FcFontMatch/Sort here we have to do it manually.
-     FcConfigSubstitute(0, pattern, FcMatchPattern);
-+    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- //     qDebug("1: pattern contains:");
- //     FcPatternPrint(pattern);
- 
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- 	    value.u.s = (const FcChar8 *)cs.data();
- 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- 	}
--#ifdef FONT_MATCH_DEBUG
--	printf("final pattern contains:\n");
--	FcPatternPrint(pattern);
--#endif
-     }
- 
-     if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
-         if (script == QFont::Latin)
-             // add Euro character
-             FcCharSetAddChar(cs, 0x20ac);
--	if (script == QFont::Han_SimplifiedChinese)
--	    FcCharSetAddChar(cs, 0x3400);
--	if (script == QFont::Han_TraditionalChinese) {
--	    FcCharSetAddChar(cs, 0x3435);
--	    FcCharSetAddChar(cs, 0xE000);
--	    FcCharSetAddChar(cs, 0xF6B1);
--	}
--	if (script == QFont::MiscellaneousSymbols)
--	    FcCharSetAddChar(cs, 0x2714);
-         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
-         FcCharSetDestroy(cs);
-     }
- 
-+#ifdef FONT_MATCH_DEBUG
-+	printf("final pattern contains:\n");
-+	FcPatternPrint(pattern);
-+#endif
-+
-     QFontEngine *fe = 0;
- 
-     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
-     // GeometricSymbols,
-     { 0x2500, 0x0 },
-     // MiscellaneousSymbols,
--    { 0x2640, 0x0 },
-+    { 0x2640, 0x2714, 0x0 },
-     // EnclosedAndSquare,
-     { 0x2460, 0x0 },
-     // Braille,
diff --git a/staging/qt3/qt-odbc.patch b/staging/qt3/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/staging/qt3/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
- 
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/staging/qt3/qt-patches.tar.bz2 b/staging/qt3/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/staging/qt3/qt-patches.tar.bz2
+++ /dev/null
diff --git a/staging/qt3/qt.install b/staging/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/staging/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/staging/qt3/qt.profile b/staging/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/staging/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/staging/qt3/qt3-png15.patch b/staging/qt3/qt3-png15.patch
deleted file mode 100644
index e64fea36a..000000000
--- a/staging/qt3/qt3-png15.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $
-
---- src/kernel/qpngio.cpp.orig	2007-02-02 10:01:15.000000000 -0400
-+++ src/kernel/qpngio.cpp
-@@ -43,6 +43,7 @@
- #include "qiodevice.h"
- 
- #include <png.h>
-+#include <zlib.h>
- 
- 
- #ifdef Q_OS_TEMP
-@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct
-     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	0, 0, 0);
- 
-+    png_colorp info_ptr_palette = NULL;
-+    int info_ptr_num_palette = 0;
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
-+    }
-+
-+    png_bytep info_ptr_trans_alpha = NULL;
-+    int info_ptr_num_trans = 0;
-+    png_color_16p info_ptr_trans_color = NULL;
-+
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-+	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
-+    }
-+
-+
-     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- 	// Black & White or 8-bit grayscale
--	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+	if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- 	    png_set_invert_mono( png_ptr );
- 	    png_read_update_info( png_ptr, info_ptr );
- 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
-@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr_trans_color->gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct
- 	}
-     } else if ( color_type == PNG_COLOR_TYPE_PALETTE
-      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
--     && info_ptr->num_palette <= 256 )
-+     && info_ptr_num_palette <= 256 )
-     {
- 	// 1-bit and 8-bit color
- 	if ( bit_depth != 1 )
-@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct
- 	png_read_update_info( png_ptr, info_ptr );
- 	png_get_IHDR(png_ptr, info_ptr,
- 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
--	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+	if (!image.create(width, height, bit_depth, info_ptr_num_palette,
- 	    QImage::BigEndian))
- 	    return;
- 	int i = 0;
- 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- 	    image.setAlphaBuffer( TRUE );
--	    while ( i < info_ptr->num_trans ) {
-+	    while ( i < info_ptr_num_trans ) {
- 		image.setColor(i, qRgba(
--		    info_ptr->palette[i].red,
--		    info_ptr->palette[i].green,
--		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr_palette[i].red,
-+		    info_ptr_palette[i].green,
-+		    info_ptr_palette[i].blue,
-+		    info_ptr_trans_alpha[i]
- 		    )
- 		);
- 		i++;
- 	    }
- 	}
--	while ( i < info_ptr->num_palette ) {
-+	while ( i < info_ptr_num_palette ) {
- 	    image.setColor(i, qRgba(
--		info_ptr->palette[i].red,
--		info_ptr->palette[i].green,
--		info_ptr->palette[i].blue,
-+		info_ptr_palette[i].red,
-+		info_ptr_palette[i].green,
-+		info_ptr_palette[i].blue,
- 		0xff
- 		)
- 	    );
-@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio)
- 	return;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	iio->setStatus(-4);
- 	return;
-@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q
- 	return FALSE;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return FALSE;
-     }
-@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q
- 
-     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
- 
-+#warning XXXtnn not too sure about this
-+/* 
-+according to png.h, channels is only used on read, not writes, so we
-+should be able to comment this out.
-+
-     info_ptr->channels =
- 	(image.depth() == 32)
- 	    ? (image.hasAlphaBuffer() ? 4 : 3)
- 	    : 1;
-+*/
- 
-     png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
- 	image.depth() == 1 ? 1 : 8 /* per channel */,
-@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q
- 		: PNG_COLOR_TYPE_RGB
- 	    : PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
- 
-+    png_color_8 sig_bit;
-+    sig_bit.red = 8;
-+    sig_bit.green = 8;
-+    sig_bit.blue = 8;
-+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 
--    //png_set_sBIT(png_ptr, info_ptr, 8);
--    info_ptr->sig_bit.red = 8;
--    info_ptr->sig_bit.green = 8;
--    info_ptr->sig_bit.blue = 8;
- 
-     if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
-        png_set_packswap(png_ptr);
-@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q
- 	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
- 	int* trans = new int[num_palette];
- 	int num_trans = 0;
-+	png_colorp info_ptr_palette = NULL;
-+	int tmp;
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
- 	for (int i=0; i<num_palette; i++) {
- 	    QRgb rgb=image.color(i);
--	    info_ptr->palette[i].red = qRed(rgb);
--	    info_ptr->palette[i].green = qGreen(rgb);
--	    info_ptr->palette[i].blue = qBlue(rgb);
-+	    info_ptr_palette[i].red = qRed(rgb);
-+	    info_ptr_palette[i].green = qGreen(rgb);
-+	    info_ptr_palette[i].blue = qBlue(rgb);
- 	    if (image.hasAlphaBuffer()) {
- 		trans[i] = rgb >> 24;
- 		if (trans[i] < 255) {
-@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q
- 		}
- 	    }
- 	}
-+	png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
- 	if (num_trans) {
- 	    copy_trans = new png_byte[num_trans];
- 	    for (int i=0; i<num_trans; i++)
-@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q
-     }
- 
-     if ( image.hasAlphaBuffer() ) {
--	info_ptr->sig_bit.alpha = 8;
-+        png_color_8p sig_bit;
-+        png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-+        sig_bit->alpha = 8;
-+        png_set_sBIT(png_ptr, info_ptr, sig_bit);
-     }
- 
-     // Swap ARGB to RGBA (normal PNG format) before saving on
-@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 	    return -1;
- 	}
- 
--	if (setjmp((png_ptr)->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	    image = 0;
- 	    return -1;
-@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 
-     if ( !png_ptr ) return 0;
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	image = 0;
- 	state = MovieStart;
-@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
-     consumer->frameDone(QPoint(offx,offy),r);
-     consumer->end();
-     state = FrameStart;
--    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+    unused_data = png_process_data_pause(png, 0);
- }
- 
- #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/staging/qt3/utf8-bug-qt3.diff b/staging/qt3/utf8-bug-qt3.diff
deleted file mode 100644
index 43e84a99f..000000000
--- a/staging/qt3/utf8-bug-qt3.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
- 
- class QUtf8Decoder : public QTextDecoder {
-     uint uc;
-+    uint min_uc;
-     int need;
-     bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- 	result.setLength( len ); // worst case
- 	QChar *qch = (QChar *)result.unicode();
- 	uchar ch;
-+        int error = -1;
- 	for (int i=0; i<len; i++) {
--	    ch = *chars++;
-+	    ch = chars[i];
- 	    if (need) {
- 		if ( (ch&0xc0) == 0x80 ) {
- 		    uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- 			    *qch++ = QChar(high);
- 			    *qch++ = QChar(low);
- 			    headerDone = TRUE;
-+			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                            *qch++ = QChar::replacement;
- 			} else {
- 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
- 				*qch++ = uc;
-@@ -190,6 +194,7 @@
- 		    }
- 		} else {
- 		    // error
-+                    i = error;
- 		    *qch++ = QChar::replacement;
- 		    need = 0;
- 		}
-@@ -200,12 +205,21 @@
- 		} else if ((ch & 0xe0) == 0xc0) {
- 		    uc = ch & 0x1f;
- 		    need = 1;
-+                    error = i;
-+		    min_uc = 0x80;
- 		} else if ((ch & 0xf0) == 0xe0) {
- 		    uc = ch & 0x0f;
- 		    need = 2;
-+                    error = i;
-+		    min_uc = 0x800;
- 		} else if ((ch&0xf8) == 0xf0) {
- 		    uc = ch & 0x07;
- 		    need = 3;
-+                    error = i;
-+                    min_uc = 0x10000;
-+                } else {
-+                    // error
-+                    *qch++ = QChar::replacement;
- 		}
- 	    }
- 	}
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
-     result.setLength( len ); // worst case
-     QChar *qch = (QChar *)result.unicode();
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -5822,6 +5823,12 @@
- 			unsigned short low = uc%0x400 + 0xdc00;
- 			*qch++ = QChar(high);
- 			*qch++ = QChar(low);
-+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = QChar(0xdbff);
-+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
- 		    } else {
- 			*qch++ = uc;
- 		    }
-@@ -5844,14 +5851,17 @@
- 		uc = ch & 0x1f;
- 		need = 1;
- 		error = i;
-+		min_uc = 0x80;
- 	    } else if ((ch & 0xf0) == 0xe0) {
- 		uc = ch & 0x0f;
- 		need = 2;
- 		error = i;
-+		min_uc = 0x800;
- 	    } else if ((ch&0xf8) == 0xf0) {
- 		uc = ch & 0x07;
- 		need = 3;
- 		error = i;
-+		min_uc = 0x10000;
- 	    } else {
- 	        // Error
-                 qch = addOne(qch, result);
diff --git a/staging/qtiplot/PKGBUILD b/staging/qtiplot/PKGBUILD
deleted file mode 100644
index 63ca7eeb9..000000000
--- a/staging/qtiplot/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 148020 2012-01-30 01:36:28Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir.archlinux.org>
-# Contributor: Gergely Imreh <imrehg@gmail.com>
-
-pkgname=qtiplot
-pkgver=0.9.8.8
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/qtiplot.html"
-pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
-# build against qwtplot3d provided in the package ...
-# build against qwt provided in the package ...
-# as systemwide one doesn't provide all needed functions
-makedepends=('pkg-config' 'boost')
-license=('GPL2')
-install=${pkgname}.install
-source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
-        $pkgname.desktop
-        $pkgname.png
-        build.conf.archlinux
-        qwtplot3d_gcc.patch
-        qtiplot.xml
-	qtiplot-0.9.8.6-gold.patch
-	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch
-        qwtplot3d-qt-4.8.0.patch
-        qwtplot3d-libpng15.patch)
-sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
-          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
-          '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
-          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
-          '285f57d865956d93250ec548288c5bface096b6b'
-          'b534a609f317cf3117d6495909854cdacea20124'
-          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0'
-          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
-          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # gentoo fixes  
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
-#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
-
-   # build also static qwtplot3d lib
-   echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
-
-  # install build configuration file
-  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
-
-  # Make qwt
-  sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
-  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
-  cd ./3rdparty/qwt
-  qmake
-  make
-
-  # Make qwtplot3d
-  cd ../qwtplot3d
-  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
-  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
-  qmake
-  make
-
-  # Make qtiplot
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  # fix stuff
-  sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
-  sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
-  sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
-
-  qmake qtiplot.pro QMAKESPEC=linux-g++
-  make QTDIR=/usr/ QMAKESPEC=linux-g++
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  INSTALL_ROOT="${pkgdir}" make install
-
-  # make it nice:
-  install -D -m644 "${srcdir}/${pkgname}.png" \
-  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-}
-
-
diff --git a/staging/qtiplot/build.conf.archlinux b/staging/qtiplot/build.conf.archlinux
deleted file mode 100644
index 7ccded7fa..000000000
--- a/staging/qtiplot/build.conf.archlinux
+++ /dev/null
@@ -1,32 +0,0 @@
-isEmpty( QTI_ROOT ) {
-  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-}
-
-SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib -lGLU
-
-MUPARSER_LIBS = -lmuparser 
-GSL_LIBS = -lgsl -lgslcblas
-BOOST_INCLUDEPATH = /usr/include/boost
-BOOST_LIBS = -lboost_date_time -lboost_thread
-QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
-QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-LIB_ORIGIN_LIBS = -lorigin2
-QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
-TAMUANOVA_LIBS = -ltamuanova
-TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
-LIBPNG_LIBS = -lpng
-
-PYTHON = python2
-LUPDATE = lupdate
-LRELEASE = lrelease
-
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-CONFIG          += CustomInstall
-DEFINES         += SCRIPTING_CONSOLE
-
diff --git a/staging/qtiplot/qtiplot-0.9.8.6-gold.patch b/staging/qtiplot/qtiplot-0.9.8.6-gold.patch
deleted file mode 100644
index 3b6757533..000000000
--- a/staging/qtiplot/qtiplot-0.9.8.6-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/qtiplot.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 99e0e36..b7cf373 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$QWT3D_LIBS
- LIBS         += $$GSL_LIBS
-+LIBS         += -lz
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/staging/qtiplot/qtiplot-0.9.8.6-kde.patch b/staging/qtiplot/qtiplot-0.9.8.6-kde.patch
deleted file mode 100644
index 919ec6cc2..000000000
--- a/staging/qtiplot/qtiplot-0.9.8.6-kde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/src/plot2D/Graph.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 626172a..d4eab1b 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -73,6 +73,7 @@
- #include <PatternBox.h>
- #include <SymbolBox.h>
- 
-+#include <QPaintEngine>
- #include <QApplication>
- #include <QBitmap>
- #include <QClipboard>
diff --git a/staging/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/staging/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
deleted file mode 100644
index 1644266d1..000000000
--- a/staging/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 95a5f0c..72e99ab 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
- !isEmpty(TAMUANOVA_LIBS) {
- 	DEFINES += HAVE_TAMUANOVA
- 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
--	#LIBS        += $$TAMUANOVA_LIBS
--
--	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
-+	LIBS        += $$TAMUANOVA_LIBS
- }
- 
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
diff --git a/staging/qtiplot/qtiplot.desktop b/staging/qtiplot/qtiplot.desktop
deleted file mode 100644
index ab64b3852..000000000
--- a/staging/qtiplot/qtiplot.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=qtiplot
-Comment=An application for plotting and analysis of data sets and functions
-Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
-Terminal=false
-Name=QtiPlot
-Protocols=file
-Icon=/usr/share/pixmaps/qtiplot.png
-# Categories=QT;KDE;Science;Utility;X-KDE-More
-# Categories=Qt;KDE;Math;Education
-Categories=Science;X-Plotting;
diff --git a/staging/qtiplot/qtiplot.install b/staging/qtiplot/qtiplot.install
deleted file mode 100644
index 66631520d..000000000
--- a/staging/qtiplot/qtiplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
diff --git a/staging/qtiplot/qtiplot.png b/staging/qtiplot/qtiplot.png
deleted file mode 100644
index 5b4b87b21..000000000
--- a/staging/qtiplot/qtiplot.png
+++ /dev/null
diff --git a/staging/qtiplot/qtiplot.xml b/staging/qtiplot/qtiplot.xml
deleted file mode 100644
index 7ad4c4aa0..000000000
--- a/staging/qtiplot/qtiplot.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qtiplot-project">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file</comment>
-    <glob pattern="*.qti" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-compressed">
-    <comment>Compressed QtiPlot project file</comment>
-    <glob pattern="*.qti.gz" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-backup">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file backup</comment>
-    <glob pattern="*.qti~" />
-  </mime-type>
-</mime-info>
diff --git a/staging/qtiplot/qwtplot3d-libpng15.patch b/staging/qtiplot/qwtplot3d-libpng15.patch
deleted file mode 100644
index 828f0c6d8..000000000
--- a/staging/qtiplot/qwtplot3d-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
-+++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
-@@ -47,6 +47,7 @@
- #endif
- 
- #if defined(GL2PS_HAVE_LIBPNG)
-+#include <zlib.h>
- #include <png.h>
- #endif
- 
diff --git a/staging/qtiplot/qwtplot3d-qt-4.8.0.patch b/staging/qtiplot/qwtplot3d-qt-4.8.0.patch
deleted file mode 100644
index 9d30f6b7b..000000000
--- a/staging/qtiplot/qwtplot3d-qt-4.8.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
-@@ -2,12 +2,7 @@
- #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
- 
- #include <time.h>
--
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
- 
- #include "qwt3d_types.h"
- #include "qwt3d_io.h"
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
-@@ -2,11 +2,8 @@
- #define __openglhelper_2003_06_06_15_49__
- 
- #include "qglobal.h"
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
-+#include <GL/glu.h>
- 
- namespace Qwt3D
- {
diff --git a/staging/qtiplot/qwtplot3d_gcc.patch b/staging/qtiplot/qwtplot3d_gcc.patch
deleted file mode 100644
index 06aeb50f5..000000000
--- a/staging/qtiplot/qwtplot3d_gcc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-@@ -1,5 +1,6 @@
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
-+#include <cstdio>
- 
- using namespace Qwt3D;
- 
diff --git a/staging/qtiplot/sip.patch b/staging/qtiplot/sip.patch
deleted file mode 100644
index 146f4c277..000000000
--- a/staging/qtiplot/sip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qtiplot/src/scripting/scripting.pri.bak	2009-09-09 07:18:51.000000000 +0800
-+++ qtiplot/src/scripting/scripting.pri	2009-11-08 12:45:03.000000000 +0800
-@@ -80,7 +80,9 @@
-              $${SIP_DIR}/sipqtiPythonScript.cpp\

-              $${SIP_DIR}/sipqtiPythonScripting.cpp\

-              $${SIP_DIR}/sipqtiFolder.cpp\

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

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

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

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

-              $${SIP_DIR}/sipqtiFit.cpp \

-              $${SIP_DIR}/sipqtiExponentialFit.cpp \

-              $${SIP_DIR}/sipqtiTwoExpFit.cpp \

diff --git a/staging/r/PKGBUILD b/staging/r/PKGBUILD
deleted file mode 100644
index 835723982..000000000
--- a/staging/r/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 147684 2012-01-27 00:28:38Z eric $
-# 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.0
-pkgrel=2
-pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
-license=('GPL')
-url=('http://www.r-project.org/')
-depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
-         'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'tk' 'libxt' 'libxmu' 'pango' 'xz')
-makedepends=('openjdk6' 'gcc-fortran')
-backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
-options=('!makeflags')
-source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
-	'r.desktop'
-	'r.png')
-install=r.install
-sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef'
-          '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/staging/r/r.desktop b/staging/r/r.desktop
deleted file mode 100644
index 68b49c447..000000000
--- a/staging/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/staging/r/r.install b/staging/r/r.install
deleted file mode 100644
index d3289ab64..000000000
--- a/staging/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/staging/r/r.png b/staging/r/r.png
deleted file mode 100644
index 1303ccdb9..000000000
--- a/staging/r/r.png
+++ /dev/null
diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD
deleted file mode 100644
index cac90d2da..000000000
--- a/staging/redland/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 145821 2012-01-02 11:29:29Z andrea $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org> 
-
-pkgbase=redland
-epoch=1
-pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.15
-pkgrel=3
-url="http://librdf.org/"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
-options=('!libtool')
-source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
-        rpath.diff)
-sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af'
-          '3aeef38a7247ae33db6a0a19511ef4132240164b'
-          'f5db05c925b6bcd6402d5abd75c648b137f069c7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--enable-release \
-	--disable-static \
-	--with-raptor=system \
-	--with-rasqal=system \
-	--with-sqlite=3
-
-  # nuke rpath
-  patch -Np0 -i "${srcdir}/rpath.diff"
-
-  make
-}
-
-package_redland() {
- pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl')
- 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/redland"
-}
-
-package_redland-storage-mysql() {
- pkgdesc="MySQL storage support for Redland"
- depends=('redland' 'libmysqlclient')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_mysql.so "${pkgdir}/usr/lib/redland/librdf_storage_mysql.so"
-}
-
-package_redland-storage-postgresql() {
- pkgdesc="PostgreSQL storage support for Redland"
- depends=('redland' 'postgresql-libs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_postgresql.so "${pkgdir}/usr/lib/redland/"
-}
-
-package_redland-storage-virtuoso() {
- pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_virtuoso.so "${pkgdir}/usr/lib/redland/"
-}
-
-package_redland-storage-sqlite() {
- pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
- 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/"
-}
diff --git a/staging/redland/rpath.diff b/staging/redland/rpath.diff
deleted file mode 100644
index 831bc80ed..000000000
--- a/staging/redland/rpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool	2011-02-20 10:46:47.000000000 +0100
-+++ libtool.new	2011-02-20 10:52:58.285764909 +0100
-@@ -324,7 +324,7 @@
- 
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
-+hardcode_libdir_flag_spec=" "
- 
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
diff --git a/staging/rrdtool/PKGBUILD b/staging/rrdtool/PKGBUILD
deleted file mode 100644
index ec9476a0b..000000000
--- a/staging/rrdtool/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 146899 2012-01-19 04:20:31Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=rrdtool
-pkgver=1.4.5
-pkgrel=5
-pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
-url="http://www.rrdtool.org"
-license=('GPL' 'custom')
-depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
-optdepends=('tcl: to use corresponding binding' \
-            'python2: to use corresponding binding' \
-            'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
-options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL
-  PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
-    --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
-    --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD
deleted file mode 100644
index 702406e58..000000000
--- a/staging/ruby/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 145849 2012-01-03 02:35:43Z eric $
-# Maintainer:
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-pkgbase=ruby
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p0
-pkgrel=3
-pkgdesc="An object-oriented language for quick and easy programming"
-arch=('i686' 'x86_64')
-url="http://www.ruby-lang.org/en/"
-license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
-options=('!emptydirs' '!makeflags')
-source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
-sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
-      --enable-shared --enable-pthread --disable-rpath
-  make
-}
-
-package_ruby() {
-  depends=('openssl' 'libffi' 'libyaml')
-  provides=('rubygems' 'rake')
-  conflicts=('rake')
-  optdepends=('tk: for Ruby/TK')
-
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-nodoc
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
-}
-
-package_ruby-docs() {
-  pkgdesc="Documentation files for ruby"
-
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-doc install-capi
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
-}
diff --git a/staging/sane/PKGBUILD b/staging/sane/PKGBUILD
deleted file mode 100644
index a5ea125be..000000000
--- a/staging/sane/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 147246 2012-01-25 02:31:45Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Simo L. <neotuli@yahoo.com>
-# Contributor: eric <eric@archlinux.org>
-
-pkgname=sane
-pkgver=1.0.22
-pkgrel=5
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
-makedepends=('texlive-latexextra')
-install=$pkgname.install
-backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
-source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
-        'sane.xinetd'
-        'libv4l-0.8.3.patch'
-        'xerox_mfp_fix_usb_devices.patch')
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2'
-         'e645a8921cff9f18ffbdabb2ed885060'
-         'cfef73e7db7c28308914d3db6767d852')
-options=(!libtool)
-
-build() {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
-  patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch
-  # fix https://bugs.archlinux.org/task/26114
-  patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-docdir=/usr/share/doc/sane \
-    --enable-avahi \
-    --disable-locking
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # fix hp officejets
-  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
-  # install udev files
-  install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/lib/udev/rules.d/53-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules"
-  
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-}
diff --git a/staging/sane/libv4l-0.8.3.patch b/staging/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/staging/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date:   Wed Feb 16 19:37:43 2011 +0100
-
-    Fix v4l build with libv4l 0.8.3+
-
-    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
-    Conflicts:
-
-    	ChangeLog
-
-    Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c |    3 +--
- backend/v4l.h |    3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
- 
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
- 
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
- 
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
- 
-@@ -165,7 +166,7 @@ struct video_channel
- 
- 
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
- 
- #include <../include/sane/sane.h>
- 
--- 
-1.7.4
-
diff --git a/staging/sane/sane.install b/staging/sane/sane.install
deleted file mode 100644
index 5ec361eea..000000000
--- a/staging/sane/sane.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	/bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
diff --git a/staging/sane/sane.xinetd b/staging/sane/sane.xinetd
deleted file mode 100644
index b035664b4..000000000
--- a/staging/sane/sane.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service sane-port
-{
-	port        = 6566
-	socket_type = stream
-	wait        = no
-	user        = root
-	group       = scanner
-	server      = /usr/sbin/saned
-	# disabled by default!
-	disable     = yes
-		  }
diff --git a/staging/sane/xerox_mfp_fix_usb_devices.patch b/staging/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/staging/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
- static struct device *devices_head = NULL;	/* sane_get_devices list */
- 
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
-     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
-     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
--    { 0 }
- };
- 
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
-   devices_head = NULL;
- }
- 
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+  if (strncmp("tcp", devname, 3) == 0)
-+    return &available_transports[TRANSPORT_TCP];
-+  return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
-       return SANE_STATUS_GOOD;
-   }
- 
--  for (tr = available_transports; tr->ttype; tr++) {
--    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--      break;
--  }
--  if (!tr->ttype)
--    return SANE_STATUS_INVAL;
-+  tr = tr_from_devname(devname);
- 
-   dev = calloc (1, sizeof (struct device));
-   if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
--    transport *tr;
--
--    for (tr = available_transports; tr->ttype; tr++) {
--	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--	    return tr->configure_device(devname, list_one_device);
--    }
--    return	SANE_STATUS_INVAL;
-+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
- 
- SANE_Status
diff --git a/staging/scim-anthy/PKGBUILD b/staging/scim-anthy/PKGBUILD
deleted file mode 100644
index f34466307..000000000
--- a/staging/scim-anthy/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146909 2012-01-19 05:06:58Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=scim-anthy
-pkgver=1.2.7
-pkgrel=3
-_filecode=37309
-pkgdesc='Japanese input method module for SCIM'
-arch=('i686' 'x86_64')
-url='http://sourceforge.jp/projects/scim-imengine/'
-license=('GPL')
-depends=('scim' 'anthy')
-options=('!libtool')
-source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --disable-static
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
diff --git a/staging/scim-chewing/PKGBUILD b/staging/scim-chewing/PKGBUILD
deleted file mode 100644
index 0d2c298af..000000000
--- a/staging/scim-chewing/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 146907 2012-01-19 05:02:07Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: whisky <archlinux.cle(at)gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=scim-chewing
-pkgver=0.3.4
-pkgrel=2
-pkgdesc='Traditional Chinese input method module for SCIM'
-arch=('i686' 'x86_64')
-url='http://chewing.csie.net/'
-license=('GPL')
-depends=('scim' 'libchewing')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --disable-static
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/scim-tables/PKGBUILD b/staging/scim-tables/PKGBUILD
deleted file mode 100644
index 06f296f43..000000000
--- a/staging/scim-tables/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146905 2012-01-19 04:58:35Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Gan Lu <rhythm.gan@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=scim-tables
-pkgver=0.5.10
-pkgrel=2
-pkgdesc='Generic table input method module for SCIM'
-url='http://www.scim-im.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('scim')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --enable-static=no
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/scribus/PKGBUILD b/staging/scribus/PKGBUILD
deleted file mode 100644
index 244d83f32..000000000
--- a/staging/scribus/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 147755 2012-01-28 03:27:34Z eric $
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=scribus
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64')
-url="http://www.scribus.net"
-license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
-         'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
-         'desktop-file-utils' 'shared-mime-info')
-makedepends=('cmake')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ae19e62399941fb8e868d8e762caf494')
-sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
-
-build() {
-	cd "${srcdir}"
-	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-               ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-	   -DCMAKE_INSTALL_PREFIX=/usr \
-	   -DCMAKE_BUILD_TYPE=Release \
-	   -DCMAKE_SKIP_RPATH=ON \
-	   -DWANT_CAIRO=1 \
-	   -DLIB_SUFFIX=""
-	make
-}
-
-package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}" install
-
-	# fix icon path in .desktop file
-	sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-	   "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
-
-	install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
-	   "${pkgdir}/usr/share/applications/scribus.desktop"
-}
diff --git a/staging/scribus/scribus.install b/staging/scribus/scribus.install
deleted file mode 100644
index 0598e46ed..000000000
--- a/staging/scribus/scribus.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-post_install() {
-  echo "update desktop mime database..."
-  update-mime-database usr/share/mime > /dev/null 2>&1
-  update-desktop-database -q > /dev/null 2>&1
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/sdl_image/PKGBUILD b/staging/sdl_image/PKGBUILD
deleted file mode 100644
index b42e26880..000000000
--- a/staging/sdl_image/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 147224 2012-01-24 20:21:56Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sdl_image
-pkgver=1.2.12
-pkgrel=2
-pkgdesc="A simple library to load images of various formats as SDL surfaces"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib')
-options=('!libtool')
-url="http://www.libsdl.org/projects/SDL_image/"
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz)
-md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
-
-build() {
-  cd "$srcdir/SDL_image-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/SDL_image-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/skanlite/PKGBUILD b/staging/skanlite/PKGBUILD
deleted file mode 100644
index 2690b7308..000000000
--- a/staging/skanlite/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147182 2012-01-24 01:29:19Z foutrelis $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=skanlite
-pkgver=0.8
-pkgrel=2
-pkgdesc="Image Scanning Application for KDE"
-arch=('i686' 'x86_64')
-url='http://kde-apps.org/content/show.php?content=109803'
-license=('GPL')
-depends=('kdebase-runtime' 'libksane')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('baa43dbc78be696e121969b0a3d88929')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/slim/PKGBUILD b/staging/slim/PKGBUILD
deleted file mode 100644
index f7f5406c1..000000000
--- a/staging/slim/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 147688 2012-01-27 02:04:48Z eric $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-
-pkgname=slim
-pkgver=1.3.2
-pkgrel=7
-pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'pam.d'
-        'logrotate'
-        'ptr_pam.patch'
-        'no-host.patch'
-        'restart.patch'
-        'sigterm.patch'
-        'session-name.patch'
-        'tty-slowness.patch'
-        'slim-1.3.2-libpng15.patch')
-sha1sums=('e421d5487732c8317f8f591906661e014b036358'
-          '6fe0ba83509af634bce47be34e30995965bffc79'
-          'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
-          'b969cc902c1d9915a5609141a652c77b2732407b'
-          '640668c984a13593a1bfba8d3b503c005d5f401e'
-          'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
-          '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
-          '0b35048723c527fb824c5e0f9b9064f751871785'
-          'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
-          '213fefe8533c845ea8c40585b6a8097820d5e5d2'
-          '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i -e 's/png12/png15/g' Makefile
-	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
-	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
-	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
-	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
-	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
-	patch -p0 -i ../slim-1.3.2-libpng15.patch
-
-	make USE_PAM=1
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" MANDIR=/usr/share/man install
-
-	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
-	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
-	install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
-
-	# Provide sane defaults
-	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
-}
diff --git a/staging/slim/install b/staging/slim/install
deleted file mode 100644
index 65aa77d72..000000000
--- a/staging/slim/install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
diff --git a/staging/slim/logrotate b/staging/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/staging/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/staging/slim/no-host.patch b/staging/slim/no-host.patch
deleted file mode 100644
index c40f25bca..000000000
--- a/staging/slim/no-host.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Datum: Sun, 30 Jan 2011 12:49:00 +0200
-Von: Samuli Suominen <ssuominen@gentoo.org>
-An: jgc@archlinux.org, andyrtr@archlinux.org, thayer@archlinux.org
-Betreff: SLIM and ConsoleKit 0.4.2 (and up)
-
-People have been coming to #xfce after Arch's ConsoleKit 0.4.3 upgrade
-to ask for help why Suspend / Hibernate / and such doesn't work.
-
-It's because SLIM is using pam_ck_connector.so and SLIM sets Host to localhost
-and makes pam_ck_connector.so believe it's actually a *remote host* called
-localhost and will refuse access.
-
-http://bugs.gentoo.org/346037
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log
-
-
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp	2011-01-30 12:39:34.033337944 +0100
-+++ new/app.cpp	2011-01-30 12:40:25.843337943 +0100
-@@ -228,8 +228,6 @@
-         pam.start("slim");
-         pam.set_item(PAM::Authenticator::TTY, DisplayName);
-         pam.set_item(PAM::Authenticator::Requestor, "root");
--        pam.set_item(PAM::Authenticator::Host, "localhost");
--
-     }
-     catch(PAM::Exception& e){
-         cerr << APPNAME << ": " << e << endl;
diff --git a/staging/slim/pam.d b/staging/slim/pam.d
deleted file mode 100644
index 78a981f74..000000000
--- a/staging/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
-session         optional        pam_ck_connector.so
diff --git a/staging/slim/ptr_pam.patch b/staging/slim/ptr_pam.patch
deleted file mode 100644
index 3a3fbcdb7..000000000
--- a/staging/slim/ptr_pam.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp	2010-07-08 07:04:10.000000000 +0200
-+++ new/app.cpp	2011-05-01 18:30:52.933844872 +0200
-@@ -43,8 +43,8 @@
-     Panel* panel = *static_cast<Panel**>(appdata_ptr);
-     int result = PAM_SUCCESS;
-     for (int i=0; i<num_msg; i++){
--        resp[i]->resp=0;
--        resp[i]->resp_retcode=0;
-+        (*resp)[i].resp=0;
-+        (*resp)[i].resp_retcode=0;
-         switch(msg[i]->msg_style){
-             case PAM_PROMPT_ECHO_ON:
-                 // We assume PAM is asking for the username
-@@ -53,13 +53,13 @@
-                     case Panel::Suspend:
-                     case Panel::Halt:
-                     case Panel::Reboot:
--                        resp[i]->resp=strdup("root");
-+                        (*resp)[i].resp=strdup("root");
-                         break;
- 
-                     case Panel::Console:
-                     case Panel::Exit:
-                     case Panel::Login:
--                        resp[i]->resp=strdup(panel->GetName().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetName().c_str());
-                         break;
-                 }
-                 break;
-@@ -75,7 +75,7 @@
- 
-                     default:
-                         panel->EventHandler(Panel::Get_Passwd);
--                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
-                         break;
-                 }
-                 break;
-@@ -91,9 +91,9 @@
-     }
-     if (result!=PAM_SUCCESS){
-         for (int i=0; i<num_msg; i++){
--            if (resp[i]->resp==0) continue;
--            free(resp[i]->resp);
--            resp[i]->resp=0;
-+            if ((*resp)[i].resp==0) continue;
-+            free((*resp)[i].resp);
-+            (*resp)[i].resp=0;
-         };
-         free(*resp);
-         *resp=0;
diff --git a/staging/slim/rc.d b/staging/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/staging/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/slim/restart.patch b/staging/slim/restart.patch
deleted file mode 100644
index 4e5049000..000000000
--- a/staging/slim/restart.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663
-
-
-diff -aur slim-1.3.2.b/app.cpp slim-1.3.2.c/app.cpp
---- slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-+++ slim-1.3.2.c/app.cpp	2010-08-21 15:11:03.946389843 +0200
-@@ -104,6 +104,11 @@
- 
- extern App* LoginApp;
- 
-+int xioerror(Display *disp) {
-+	LoginApp->RestartServer();
-+    return 0;
-+}
-+
- void CatchSignal(int sig) {
-     cerr << APPNAME << ": unexpected signal " << sig << endl;
- 
-@@ -114,19 +119,6 @@
-     exit(ERR_EXIT);
- }
- 
--
--void AlarmSignal(int sig) {
--    int pid = LoginApp->GetServerPID();
--    if(waitpid(pid, NULL, WNOHANG) == pid) {
--        LoginApp->StopServer();
--        LoginApp->RemoveLock();
--        exit(OK_EXIT);
--    }
--    signal(sig, AlarmSignal);
--    alarm(2);
--}
--
--
- void User1Signal(int sig) {
-     signal(sig, User1Signal);
- }
-@@ -277,7 +269,6 @@
-         signal(SIGHUP, CatchSignal);
-         signal(SIGPIPE, CatchSignal);
-         signal(SIGUSR1, User1Signal);
--        signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-@@ -298,7 +289,6 @@
- 
-         CreateServerAuth();
-         StartServer();
--        alarm(2);
- #endif
- 
-     }
-@@ -614,6 +604,8 @@
-     int status;
-     while (wpid != pid) {
-         wpid = wait(&status);
-+		if (wpid == ServerPID)
-+			xioerror(Dpy);	// Server died, simulate IO error
-     }
-     if (WIFEXITED(status) && WEXITSTATUS(status)) {
-         LoginPanel->Message("Failed to execute login command");
-@@ -659,9 +651,6 @@
- 
- 
- void App::Reboot() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -684,9 +673,6 @@
- 
- 
- void App::Halt() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -772,6 +758,7 @@
- 
-     StopServer(); 
-     RemoveLock();
-+	while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
-     Run();
- } 
- 
-@@ -842,6 +829,7 @@
- 
-     for(cycles = 0; cycles < ncycles; cycles++) {
-         if((Dpy = XOpenDisplay(DisplayName))) {
-+            XSetIOErrorHandler(xioerror);
-             return 1;
-         } else {
-             if(!ServerTimeout(1, (char *) "X server to begin accepting connections"))
-@@ -926,9 +914,6 @@
-             ServerPID = -1;
-             break;
-         }
--        alarm(15);
--        pause();
--        alarm(0);
- 
-         // Wait for server to start up
-         if(WaitForServer() == 0) {
-@@ -963,15 +948,12 @@
- 
- 
- void App::StopServer() {
--    // Stop alars clock and ignore signals
--    alarm(0);
-     signal(SIGQUIT, SIG_IGN);
-     signal(SIGINT, SIG_IGN);
-     signal(SIGHUP, SIG_IGN);
-     signal(SIGPIPE, SIG_IGN);
-     signal(SIGTERM, SIG_DFL);
-     signal(SIGKILL, SIG_DFL);
--    signal(SIGALRM, SIG_DFL);
- 
-     // Catch X error
-     XSetIOErrorHandler(IgnoreXIO);
-diff -aur slim-1.3.2.b/app.h slim-1.3.2.c/app.h
---- slim-1.3.2.b/app.h	2010-08-21 15:10:40.499582804 +0200
-+++ slim-1.3.2.c/app.h	2010-08-21 15:11:03.946389843 +0200
-@@ -34,6 +34,7 @@
-     ~App();
-     void Run();
-     int GetServerPID();
-+    void RestartServer();
-     void StopServer();
- 
- 	bool serverStarted;
-@@ -49,7 +50,6 @@
-     void Console();
-     void Exit();
-     void KillAllClients(Bool top);
--    void RestartServer();
-     void ReadConfig();
-     void OpenLog();
-     void CloseLog();
diff --git a/staging/slim/session-name.patch b/staging/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/staging/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/staging/slim/sigterm.patch b/staging/slim/sigterm.patch
deleted file mode 100644
index fbaeb7116..000000000
--- a/staging/slim/sigterm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur old/panel.cpp new/panel.cpp
---- old/panel.cpp	2011-04-29 15:15:57.210134850 +0200
-+++ new/panel.cpp	2011-04-29 15:16:17.260285407 +0200
-@@ -10,6 +10,7 @@
- */
- 
- #include <sstream>
-+#include <poll.h>
- #include "panel.h"
- 
- using namespace std;
-@@ -288,16 +289,24 @@
-     field=curfield;
-     bool loop = true;
-     OnExpose();
-+
-+    struct pollfd x11_pfd = {0};
-+    x11_pfd.fd = ConnectionNumber(Dpy);
-+    x11_pfd.events = POLLIN;
-     while(loop) {
--        XNextEvent(Dpy, &event);
--        switch(event.type) {
--            case Expose:
--                OnExpose();
--                break;
--
--            case KeyPress:
--                loop=OnKeyPress(event);
--                break;
-+        if(XPending(Dpy) || poll(&x11_pfd, 1, -1) > 0) {
-+            while(XPending(Dpy)) {
-+                XNextEvent(Dpy, &event);
-+                switch(event.type) {
-+                    case Expose:
-+                        OnExpose();
-+                        break;
-+
-+                    case KeyPress:
-+                        loop=OnKeyPress(event);
-+                        break;
-+                }
-+            }
-         }
-     }
- 
diff --git a/staging/slim/slim-1.3.2-libpng15.patch b/staging/slim/slim-1.3.2-libpng15.patch
deleted file mode 100644
index 720608567..000000000
--- a/staging/slim/slim-1.3.2-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- png.c
-+++ png.c
-@@ -57,7 +57,7 @@
-         return(0);
-     }
-   
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-         fclose(infile);
diff --git a/staging/slim/tty-slowness.patch b/staging/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/staging/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD
deleted file mode 100644
index 4ac83085c..000000000
--- a/staging/sox/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 146873 2012-01-19 01:56:50Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.3.2
-pkgrel=5
-pkgdesc="The Swiss Army knife of sound processing tools"
-arch=('i686' 'x86_64')
-url="http://sox.sourceforge.net/"
-license=('GPL' 'LGPL')
-depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-optdepends=('libao: for ao plugin'
-            'ffmpeg: for ffmpeg plugin'
-            'libmad: for mp3 plugin'
-            'libid3tag: for mp3 plugin'
-            'wavpack: for wavpack plugin'
-            'libpulse: for pulse plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        sox-14.3.2-ffmpeg.patch)
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
-          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
-  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-dyn-default --with-distro="Arch Linux"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/sox/sox-14.3.2-ffmpeg.patch b/staging/sox/sox-14.3.2-ffmpeg.patch
deleted file mode 100644
index 5289b9b47..000000000
--- a/staging/sox/sox-14.3.2-ffmpeg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sox-14.3.2/src/ffmpeg.c
-===================================================================
---- sox-14.3.2.orig/src/ffmpeg.c
-+++ sox-14.3.2/src/ffmpeg.c
-@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-     return -1;
--  if (enc->codec_type != CODEC_TYPE_AUDIO) {
-+  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
-     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
-     return -1;
-   }
-@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
-   /* Find audio stream (FIXME: allow different stream to be selected) */
-   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
-     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
--    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-+    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-       ffmpeg->audio_index = i;
-       break;
-     }
-@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
- 
-   c = st->codec;
-   c->codec_id = codec_id;
--  c->codec_type = CODEC_TYPE_AUDIO;
-+  c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
-   /* put sample parameters */
-   c->bit_rate = 256000;  /* FIXME: allow specification */
-@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
-       av_init_packet(&pkt);
-       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
-       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       pkt.stream_index = ffmpeg->audio_st->index;
-       pkt.data = ffmpeg->audio_buf_aligned;
- 
diff --git a/staging/streamtuner/PKGBUILD b/staging/streamtuner/PKGBUILD
deleted file mode 100644
index d25ae0451..000000000
--- a/staging/streamtuner/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 147014 2012-01-20 18:50:13Z andyrtr $
-# Contributor: Greg Grabinski <greg@grabinski.ch>
-# Maintainer: ndreas Radke <andyrtr@archlinux.org>
-
-pkgname=streamtuner
-pkgver=0.99.99
-pkgrel=12
-pkgdesc="A stream directory browser"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/streamtuner/"
-license=('custom')
-depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2')
-conflicts=('streamtuner-live365')
-replaces=('streamtuner-live365')
-source=(http://savannah.nongnu.org/download/streamtuner/$pkgname-$pkgver.tar.gz \
-        http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-live365.diff \
-        http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff
-	streamtuner-0.99.99-shoutcast.diff
-	shoutcast-redesign-patch.diff)
-options=('!libtool' '!emptydirs')
-md5sums=('2027b7c34e85b594524b0b4351c14362'
-         '8aa1994a849b05d2b8fffbda702b8a25'
-         '7aff45a41c60358cb2332c7ce644f661'
-         '1eab6edce130e1a1e5f208cd3ed6766a'
-         '8a3a17a1719a79353d6ad7ac8564947b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
-  # fix http://bugs.archlinux.org/task/10308
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
-  # fix http://bugs.archlinux.org/task/11463
-  patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
-  
-  # python2 fixes
-  sed -i "s:^for ac_prog in python:for ac_prog in python2:" ${srcdir}/${pkgname}-${pkgver}/configure
-  
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=${pkgdir}/usr install
-
-  #Add license file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/staging/streamtuner/shoutcast-redesign-patch.diff b/staging/streamtuner/shoutcast-redesign-patch.diff
deleted file mode 100644
index 644e2273e..000000000
--- a/staging/streamtuner/shoutcast-redesign-patch.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
---- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c	2008-09-12 18:04:00.229785732 -0400
-+++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c	2008-09-12 18:05:56.716440720 -0400
-@@ -37,7 +37,7 @@
- 
- /*** cpp *********************************************************************/
- 
--#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
-+#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
- 
- #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
- 
diff --git a/staging/streamtuner/streamtuner-0.99.99-shoutcast.diff b/staging/streamtuner/streamtuner-0.99.99-shoutcast.diff
deleted file mode 100644
index e7fcbca94..000000000
--- a/staging/streamtuner/streamtuner-0.99.99-shoutcast.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/plugins/shoutcast/shoutcast.c.orig	2004-12-19 15:21:00.000000000 +0000
-+++ src/plugins/shoutcast/shoutcast.c	2008-03-16 10:39:24.000000000 +0000
-@@ -94,6 +94,8 @@
- 
-   GNode			*parent_node;
-   SHOUTcastStream	*stream;
-+  
-+  int parse_genres;
- } ReloadInfo;
- 
- /*** variable declarations ***************************************************/
-@@ -518,6 +520,7 @@
-       info.npages = 0;
-       info.parent_node = NULL;
-       info.stream = NULL;
-+      info.parse_genres = 0;
- 
-       status = st_transfer_session_get_by_line(session,
- 					       url,
-@@ -565,10 +568,16 @@
-       info->stream = stream_new_cb(NULL);
-       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
-     }
--  else if (info->page < 2
--	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
--		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
--	       && (s2 = strstr(s1, "\">"))))
-+  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
-+  {
-+  	info->parse_genres = 1;
-+  }
-+  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
-+  {
-+  	info->parse_genres = 0;
-+  }
-+  else if (info->page < 2 && info->parse_genres == 1
-+	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
-     {
-       STCategory *category;
-       GNode *node;
-
diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD
deleted file mode 100644
index d4bad140e..000000000
--- a/staging/subversion/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 145884 2012-01-03 18:48:03Z stephane $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.2
-pkgrel=2
-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=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
-          '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
-          '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/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch
deleted file mode 100644
index ba6ee9e4e..000000000
--- a/staging/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/staging/subversion/svn b/staging/subversion/svn
deleted file mode 100644
index 8988aaf63..000000000
--- a/staging/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/staging/subversion/svnserve b/staging/subversion/svnserve
deleted file mode 100755
index 670fee742..000000000
--- a/staging/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/staging/subversion/svnserve.conf b/staging/subversion/svnserve.conf
deleted file mode 100644
index 37fb7ea10..000000000
--- a/staging/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/staging/totem-plparser/PKGBUILD b/staging/totem-plparser/PKGBUILD
deleted file mode 100644
index 8cb03d620..000000000
--- a/staging/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146580 2012-01-13 20:34:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=2.32.6
-pkgrel=3
-url="http://www.hadess.net/totem.php3"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874')
-
-build() {
-  cd "$srcdir/totem-pl-parser-$pkgver"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd "$srcdir/totem-pl-parser-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD
deleted file mode 100644
index 6de2cd899..000000000
--- a/staging/tracker/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 147228 2012-01-24 20:33:45Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.12.9
-_tver=${pkgver%.*}
-pkgrel=2
-pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
-             'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
-             'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
-             'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
-url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/staging/tracker/tracker.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD
deleted file mode 100644
index e491cdff1..000000000
--- a/staging/transcode/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 147748 2012-01-27 20:04:27Z ibiru $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=4
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.10.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae'
-          '3c03111cfae88db918afff3837cec7db32ace3cc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/staging/transcode/ffmpeg-0.10.patch b/staging/transcode/ffmpeg-0.10.patch
deleted file mode 100644
index 5965c180c..000000000
--- a/staging/transcode/ffmpeg-0.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
---- transcode-1.1.7.orig/filter/filter_pp.c	2012-01-27 19:55:13.706613234 +0000
-+++ transcode-1.1.7/filter/filter_pp.c	2012-01-27 19:56:04.719541629 +0000
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
diff --git a/staging/transcode/subtitleripper-0.3.4-linkingorder.patch b/staging/transcode/subtitleripper-0.3.4-linkingorder.patch
deleted file mode 100644
index 7efe22346..000000000
--- a/staging/transcode/subtitleripper-0.3.4-linkingorder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch
deleted file mode 100644
index 2af11d257..000000000
--- a/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/staging/transfig/LICENSE b/staging/transfig/LICENSE
deleted file mode 100644
index b944bb992..000000000
--- a/staging/transfig/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * TransFig: Facility for Translating Fig code
- * Copyright (c) 1991 by Micah Beck
- * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
- *
- * Any party obtaining a copy of these files is granted, free of charge, a
- * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
- * nonexclusive right and license to deal in this software and
- * documentation files (the "Software"), including without limitation the
- * rights to use, copy, modify, merge, publish and/or distribute copies of
- * the Software, and to permit persons who receive copies from any such 
- * party to do so, with the only requirement being that this copyright 
- * notice remain intact.
- *
- */
-
-THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/staging/transfig/PKGBUILD b/staging/transfig/PKGBUILD
deleted file mode 100644
index 5c03217ca..000000000
--- a/staging/transfig/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 146871 2012-01-19 01:34:27Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=transfig
-pkgver=3.2.5d
-pkgrel=1
-pkgdesc="Format conversion utility that can be used with xfig"
-arch=('i686' 'x86_64')
-url="http://www.xfig.org"
-license=('custom')
-depends=('libpng' 'libxpm')
-makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \
-        transfig-3.2.5d-libpng-1.5.patch)
-sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc'
-          'b8b712871615308b8b6add92f86d218437d652f2'
-          '9f9f332b0b31e58e59542bc1568df9617b71710a')
-
-build() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-  sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile
-  sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile
-  patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch
-
-  xmkmf
-  make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles
-  make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig
-}
-
-package() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-
-  make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \
-    FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
-    install install.man
-  install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/transfig/transfig-3.2.5d-libpng-1.5.patch b/staging/transfig/transfig-3.2.5d-libpng-1.5.patch
deleted file mode 100644
index e6f15e43e..000000000
--- a/staging/transfig/transfig-3.2.5d-libpng-1.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=356751
-
-Index: transfig.3.2.5d/fig2dev/dev/readpng.c
-===================================================================
---- transfig.3.2.5d.orig/fig2dev/dev/readpng.c
-+++ transfig.3.2.5d/fig2dev/dev/readpng.c
-@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly)
-     }
- 
-     /* set long jump here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	return 0;
-@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly)
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
--    else
--	png_set_gamma(png_ptr, 2.2, 0.45);
-+    png_fixed_point gamma = 0.45;
-+    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    png_set_gamma(png_ptr, 2.2, gamma);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+    	png_color_16p background;
-+	png_get_bKGD(png_ptr,info_ptr,&background);
-+	png_set_background(png_ptr, background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+    }
-     else {
- 	/* blend the canvas background using the alpha channel */
- 	if (bgspec) {
diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD
deleted file mode 100644
index 01b53bbc8..000000000
--- a/staging/tumbler/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 146989 2012-01-19 22:34:27Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan Jezek <honzin.jezek@gmail.com>
-
-pkgname=tumbler
-pkgver=0.1.23
-pkgrel=4
-pkgdesc="D-Bus service for applications to request thumbnails"
-arch=('i686' 'x86_64')
-url="http://git.xfce.org/xfce/tumbler/"
-license=('GPL2' 'LGPL')
-groups=('xfce4')
-depends=('dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib'
-             'libgsf' 'libopenraw' 'freetype2')
-optdepends=('ffmpegthumbnailer: for video thumbnails'
-            'gstreamer0.10: for video thumbnails'
-            'poppler-glib: for PDF thumbnails'
-            'libgsf: for ODF thumbnails'
-            'libopenraw: for RAW thumbnails'
-            'freetype2: for font thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/tuxpuck/PKGBUILD b/staging/tuxpuck/PKGBUILD
deleted file mode 100644
index 19f50020a..000000000
--- a/staging/tuxpuck/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 147018 2012-01-20 19:49:39Z giovanni $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=tuxpuck
-pkgver=0.8.2
-pkgrel=5
-pkgdesc="Airhockey with tux"
-arch=('i686' 'x86_64')
-url="http://home.no.net/munsuun/tuxpuck/"
-license=('GPL2')
-depends=('libjpeg' 'sdl' 'libpng' 'libvorbis')
-makedepends=('freetype2')
-options=('!makeflags')
-source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz"
-        'tuxpuck-0.8.2-ldflags.patch'
-        'tuxpuck-0.8.2-libpng15.patch')
-md5sums=('fc839abc2b1f3eafae397e1ed6487079'
-         'cb914d211bf3f519b7700fda180612b0'
-         'a4da530d670a0c30ac0840aab1db0dca')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  sed -i 's|usr/man|usr/share/man|' Makefile
-  sed -i -e 's/-Werror//' \
-         -e '/^CC/d' \
-         Makefile \
-         utils/Makefile \
-         data/Makefile
-
-  patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch"
-  patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch"
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-}
diff --git a/staging/tuxpuck/tuxpuck-0.8.2-ldflags.patch b/staging/tuxpuck/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index 28fcef48a..000000000
--- a/staging/tuxpuck/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-10-05 10:34:57.000000000 +0200
-+++ Makefile	2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- $(NAME) : $(OBJS)
- 	cd data; $(MAKE)
--	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
- 
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/staging/tuxpuck/tuxpuck-0.8.2-libpng15.patch b/staging/tuxpuck/tuxpuck-0.8.2-libpng15.patch
deleted file mode 100644
index ca9539f39..000000000
--- a/staging/tuxpuck/tuxpuck-0.8.2-libpng15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- png.c.old	2011-09-14 16:25:54.415338149 +0200
-+++ png.c	2011-09-14 17:41:02.190803110 +0200
-@@ -38,6 +38,8 @@
-   png_color_16 *transv;
-   SDL_RWops *src = NULL;
-   Uint32 size;
-+  int num_palette;
-+  png_colorp png_palette;
- 
-   memcpy(&size, data, sizeof(Uint32));
-   if (memcounter)
-@@ -74,7 +76,7 @@
-    * the normal method of doing things with libpng).  REQUIRED unless you
-    * set up your own error handlers in png_create_read_struct() earlier.
-    */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     SDL_SetError("Error reading the PNG file.");
-     goto done;
-   }
-@@ -142,9 +144,9 @@
-       Rmask = 0x000000FF;
-       Gmask = 0x0000FF00;
-       Bmask = 0x00FF0000;
--      Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+      Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
-     } else {
--      int s = (info_ptr->channels == 4) ? 0 : 8;
-+      int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
-       Rmask = 0xFF000000 >> s;
-       Gmask = 0x00FF0000 >> s;
-       Bmask = 0x0000FF00 >> s;
-@@ -152,7 +154,7 @@
-     }
-   }
-   surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			     bit_depth * info_ptr->channels, Rmask, Gmask,
-+			     bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,
- 			     Bmask, Amask);
-   if (surface == NULL) {
-     SDL_SetError("Out of memory");
-@@ -197,12 +199,15 @@
- 	palette->colors[i].g = i;
- 	palette->colors[i].b = i;
-       }
--    } else if (info_ptr->num_palette > 0) {
--      palette->ncolors = info_ptr->num_palette;
--      for (i = 0; i < info_ptr->num_palette; ++i) {
--	palette->colors[i].b = info_ptr->palette[i].blue;
--	palette->colors[i].g = info_ptr->palette[i].green;
--	palette->colors[i].r = info_ptr->palette[i].red;
-+    } else {
-+      png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+      if (num_palette > 0) {
-+        palette->ncolors = num_palette;
-+	for (i = 0; i < num_palette; ++i) {
-+	  palette->colors[i].b = png_palette[i].blue;
-+	  palette->colors[i].g = png_palette[i].green;
-+	  palette->colors[i].r = png_palette[i].red;
-+	}
-       }
-     }
-   }
diff --git a/staging/unison/PKGBUILD b/staging/unison/PKGBUILD
deleted file mode 100644
index 83c4cc1c5..000000000
--- a/staging/unison/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 147256 2012-01-25 05:10:29Z eric $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=unison
-pkgver=2.40.63
-pkgrel=3
-pkgdesc="Unison is a file-synchronization tool"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.cis.upenn.edu/~bcpierce/unison"
-depends=('glibc')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-optdepends=('gtk2: for gtk2 support')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
-        $pkgname.desktop)
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
-         '2daecba7705455a8e4b769e48b059872')
-options=(!makeflags)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  CFLAGS=""
-  make clean
-  make mkProjectInfo 
-  make UISTYLE=text DEBUGGING=false THREADS=true 
-  mv unison unison-text
- 
- # clean the builddir and rebuild with gtk support
-  # broken at the moment!
-  # make clean
-  # make mkProjectInfo
-  # make UISTYLE=gtk DEBUGGING=false THREADS=true
-  # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
-  make clean
-  make mkProjectInfo
-  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 unison-text "$pkgdir"/usr/bin/unison
-  install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install the png
-  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  convert win32rc/U.ico unison.png
-  install -Dm644 ${pkgname}-1.png  "$pkgdir"/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
-  cd "$pkgdir"/usr/bin
-  ln -s unison-gtk2 unison-x11
-}
diff --git a/staging/unison/unison-ssh-ocaml.patch b/staging/unison/unison-ssh-ocaml.patch
deleted file mode 100644
index 1b9c66c7f..000000000
--- a/staging/unison/unison-ssh-ocaml.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: src/terminal.ml
-===================================================================
---- src/terminal.ml	(révision 463)
-+++ src/terminal.ml	(copie de travail)
-@@ -191,7 +191,6 @@
-             exit 127
-           end
-       | childPid ->
--          Unix.close slaveFd;
-           (Some masterFd, childPid)
-       end
- 
-Index: src/update.mli
-===================================================================
---- src/update.mli	(révision 463)
-+++ src/update.mli	(copie de travail)
-@@ -1,7 +1,7 @@
- (* Unison file synchronizer: src/update.mli *)
- (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
- 
--module NameMap : Map.S with type key = Name.t
-+module NameMap : MyMap.S with type key = Name.t
- 
- type archive =
-     ArchiveDir of Props.t * archive NameMap.t
diff --git a/staging/unison/unison.desktop b/staging/unison/unison.desktop
deleted file mode 100644
index 3a7e1d762..000000000
--- a/staging/unison/unison.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
diff --git a/staging/unison/unison.install b/staging/unison/unison.install
deleted file mode 100644
index a3790ab7d..000000000
--- a/staging/unison/unison.install
+++ /dev/null
@@ -1,28 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "NOTE:"
-  echo "  For gtk1 frontend please add 'gtk' package."
-  echo "  For gtk2 frontend please add 'gtk2' package."
-  echo "  Default X11 frontend is set to gtk2. "
-  echo ""
-  echo "  If you want to default to gtk1 unison:" 
-  echo "  'rm /usr/bin/unison-x11'"
-  echo "  'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'"
-  echo ""
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
diff --git a/staging/vice/PKGBUILD b/staging/vice/PKGBUILD
deleted file mode 100644
index 92a531c26..000000000
--- a/staging/vice/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 146938 2012-01-19 12:54:40Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=vice
-pkgver=2.3
-pkgrel=5
-pkgdesc="A Versatile Commodore Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.viceteam.org/"
-depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
-         'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
-makedepends=('xorg-font-utils')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
-        'vice-2.3-x11video.patch')
-md5sums=('b48d137874daad50c087a0686cbdde34'
-         '088292ce9efe785edfb2b0c7c670785e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch
-  ./configure --prefix=/usr \
-              --with-alsa \
-              --enable-fullscreen
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/vice/vice-2.3-x11video.patch b/staging/vice/vice-2.3-x11video.patch
deleted file mode 100644
index d698638c6..000000000
--- a/staging/vice/vice-2.3-x11video.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/arch/unix/x11/xaw/x11video.c	2011-01-18 23:59:00.000000000 +0100
-+++ b/src/arch/unix/x11/xaw/x11video.c	2011-02-27 18:40:52.000000000 +0100
-@@ -60,6 +60,8 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/staging/vigra/PKGBUILD b/staging/vigra/PKGBUILD
deleted file mode 100644
index ebc7f60a6..000000000
--- a/staging/vigra/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 147002 2012-01-20 14:21:18Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgbase=vigra
-pkgname=('vigra' 'vigra-doc')
-pkgver=1.8.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://hci.iwr.uni-heidelberg.de/vigra/"
-license=('custom:MIT')
-makedepends=(# runtime deps
-             'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
-	     # additional makedeps
-             'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
-options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
-	vigra-1.7.1.gcc460.patch)
-md5sums=('15c5544448e529ee60020758ab6be264'
-         '25ef8bc26bc38ee67e5b512d2acd0166')
-sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
-          '1de6381a74dd136ea25df5a27f249187b0dbd17e')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-      -DWITH_VIGRANUMPY=1 \
-      -DDOCINSTALL=share/doc 
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make -k check || /bin/true # i686 fails
-}
-
-package_vigra() {
-  pkgdesc="Computer vision library"
-  depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
-  optdepends=('python2: for python bindings'
-              'boost-libs: for python bindings')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  
-  # remove doc
-  rm -rf "${pkgdir}"/usr/share/doc
-  
-  #fix shebang for python2
-  sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config
-}
-
-package_vigra-doc() {
-  pkgdesc="Computer vision library - documentation and examples"
-  #depends=('vigra')
-  #arch=('any')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # cleanup
-  rm -rf "${pkgdir}"/usr/{bin,include,lib}
-
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/vigra/vigra-1.7.1.gcc460.patch b/staging/vigra/vigra-1.7.1.gcc460.patch
deleted file mode 100644
index 46f194dbc..000000000
--- a/staging/vigra/vigra-1.7.1.gcc460.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx
---- vigra-1.7.1.old/include/vigra/random_forest.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/random_forest.hxx	2011-01-28 00:16:32.000000000 +0000
-@@ -43,6 +43,7 @@
- #include <set>
- #include <list>
- #include <numeric>
-+#include <stddef.h>
- #include "mathutil.hxx"
- #include "array_vector.hxx"
- #include "sized_int.hxx"
-diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
---- vigra-1.7.1.old/include/vigra/sifImport.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/sifImport.hxx	2011-01-28 00:23:31.000000000 +0000
-@@ -57,6 +57,7 @@
- #include <fstream>
- #include <cstring>
- #include <vector> 
-+#include <stddef.h>
- #include "vigra/multi_array.hxx"
- 
- namespace vigra {
-diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
---- vigra-1.7.1.old/include/vigra/multi_iterator.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/multi_iterator.hxx	2011-01-28 00:23:31.000000000 +0000
-@@ -41,6 +41,7 @@
- #define VIGRA_MULTI_ITERATOR_HXX
- 
- #include <sys/types.h>
-+#include <stddef.h>
- #include "tinyvector.hxx"
- #include "iteratortags.hxx"
- 
diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD
deleted file mode 100644
index 5da7ffc4f..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 147741 2012-01-27 19:40:23Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.13
-pkgrel=4
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/http/.hosts'
-        'usr/share/vlc/http/dialogs/.hosts'
-        'usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9678fb7a04808b6e0de63746d35e4bb1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-v4l \
-              --enable-snapshot \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --with-live555-tree=/usr/lib/live \
-              --enable-upnp \
-              --enable-realrtsp
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install
deleted file mode 100644
index dc4961cae..000000000
--- a/staging/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/wesnoth/PKGBUILD b/staging/wesnoth/PKGBUILD
deleted file mode 100644
index 325ed58e7..000000000
--- a/staging/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 147232 2012-01-24 22:47:27Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Jacobo Arvelo <unix4all@ya.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=wesnoth
-pkgver=1.8.6
-pkgrel=4
-pkgdesc="A turn-based strategy game on a fantasy world"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2')
-makedepends=('boost')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth-libpng-1.4.0.patch
-        wesnoth-1.8.6-boost-foreach.patch
-        wesnoth.tmpfiles.conf)
-md5sums=('f1c3179869b01b61e253e74aeb241034'
-         '3b0d2edcb45e8ecc8c790f92bdcb0087'
-         'dc414ab7e1334941548e9db6db9c2460'
-         'b8122f5054e3895c9c054e87460869dc')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch"
-  patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch"
-  ./autogen.sh
-  ./configure --prefix=/usr --localstatedir=/var --enable-tools \
-      --enable-editor --enable-server --with-fifodir=/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install-exec
-  install -dm755 "$pkgdir/usr/lib/tmpfiles.d/"
-  install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint"
-}
diff --git a/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch
deleted file mode 100644
index 5aee3118c..000000000
--- a/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~	2011-07-21 23:05:56.594879049 +0200
-+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp	2011-07-21 23:28:07.540358742 +0200
-@@ -238,6 +238,17 @@ void ttree_view_node::clear()
- 
- struct ttree_view_node_implementation
- {
-+	template<class W, class It>
-+	static W* find_at_aux(It begin, It end,
-+			      const tpoint& coordinate, const bool must_be_active) {
-+		for (It it = begin; it != end; ++it) {
-+			if(W* widget = it->find_at(coordinate, must_be_active)) {
-+				return widget;
-+			}
-+		}
-+		return NULL;
-+	}
-+
- 	template<class W>
- 	static W* find_at(
- 			  typename tconst_duplicator<W, ttree_view_node>::type&
-@@ -255,13 +266,9 @@ struct ttree_view_node_implementation
- 		}
- 
- 		typedef typename tconst_duplicator<W, ttree_view_node>::type thack;
--		foreach(thack& node, tree_view_node.children_) {
--			if(W* widget = node.find_at(coordinate, must_be_active)) {
--				return widget;
--			}
--		}
--
--		return NULL;
-+		return find_at_aux<W>(tree_view_node.children_.begin(),
-+				      tree_view_node.children_.end(),
-+				      coordinate, must_be_active);
- 	}
- };
- 
-@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size
- 		return size;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz
- 		size.x += (get_indention_level() - 1) * tree_view().indention_step_size_;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s
- 
- 	DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
diff --git a/staging/wesnoth/wesnoth-libpng-1.4.0.patch b/staging/wesnoth/wesnoth-libpng-1.4.0.patch
deleted file mode 100644
index 338f467af..000000000
--- a/staging/wesnoth/wesnoth-libpng-1.4.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp	2010-01-01 15:16:49.000000000 +0200
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp	2010-04-08 17:38:03.066201123 +0300
-@@ -174,8 +174,8 @@
- 	//TODO: review whether providing NULL error handlers is something
- 	//sensible
- 	png_struct* png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
--		 png_error_ptr_NULL, png_error_ptr_NULL);
-+		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL),
-+		 NULL, NULL);
- 	if(!png_ptr)
- 		throw exploder_failure("Unable to initialize the png write structure");
- 
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
-@@ -15,6 +15,7 @@
- #include "exploder_utils.hpp"
- #include "game_config.hpp"
- #include "serialization/string_utils.hpp"
-+#include <zlib.h>
- #include <png.h>
-
- exploder_point::exploder_point(const std::string &s)
diff --git a/staging/wesnoth/wesnoth.install b/staging/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/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/staging/wesnoth/wesnoth.tmpfiles.conf b/staging/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/staging/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/staging/windowmaker-crm-git/PKGBUILD b/staging/windowmaker-crm-git/PKGBUILD
deleted file mode 100644
index c8ab1a721..000000000
--- a/staging/windowmaker-crm-git/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 146857 2012-01-18 21:05:19Z daniel $
-# 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/staging/windowmaker-crm-git/libpng-1.4.patch b/staging/windowmaker-crm-git/libpng-1.4.patch
deleted file mode 100644
index 5dbe5fd25..000000000
--- a/staging/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/staging/windowmaker-crm-git/wmaker.desktop b/staging/windowmaker-crm-git/wmaker.desktop
deleted file mode 100644
index f819c7577..000000000
--- a/staging/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/staging/windowmaker/PKGBUILD b/staging/windowmaker/PKGBUILD
deleted file mode 100644
index 7d885b745..000000000
--- a/staging/windowmaker/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146855 2012-01-18 21:00:09Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-pkgname=windowmaker
-pkgver=0.95.0
-pkgrel=2
-pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
-arch=(i686 x86_64)
-url="http://www.windowmaker.org/"
-license=('GPL' 'custom')
-depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)  
-md5sums=('2d89834b4019e0a08641709ea7235db2'
-         '2fba97bebfd691836b92b8f0db79ff13')
-
-build() {
-  cd $srcdir/windowmaker-$pkgver
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
-    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
-    --enable-usermenu --enable-modelock --enable-xrandr
-  make
-}
-
-package() {
-  cd $srcdir/windowmaker-$pkgver
-  
-  make DESTDIR=$pkgdir install
-  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
-  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
-}
-
diff --git a/staging/windowmaker/libpng-1.4.patch b/staging/windowmaker/libpng-1.4.patch
deleted file mode 100644
index 419e8faca..000000000
--- a/staging/windowmaker/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c
---- WindowMaker-0.92.0-orig/wrlib/load.c	2010-01-21 16:10:39.000000000 -0500
-+++ WindowMaker-0.92.0/wrlib/load.c	2010-01-21 16:13:15.000000000 -0500
-@@ -348,7 +348,7 @@
- 
- #ifdef USE_PNG
-     /* check for PNG */
--    if (png_check_sig(buffer, 8))
-+    if (!png_sig_cmp(buffer, 0, 8))
-         return IM_PNG;
- #endif
- 
diff --git a/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 b/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2
deleted file mode 100644
index fae12a98d..000000000
--- a/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2
+++ /dev/null
diff --git a/staging/windowmaker/wmaker.desktop b/staging/windowmaker/wmaker.desktop
deleted file mode 100644
index f819c7577..000000000
--- a/staging/windowmaker/wmaker.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=windowmaker
-Exec=/usr/bin/wmaker
-Type=Application
diff --git a/staging/wv/PKGBUILD b/staging/wv/PKGBUILD
deleted file mode 100644
index 03e85ef24..000000000
--- a/staging/wv/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146944 2012-01-19 13:58:47Z giovanni $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=wv
-pkgver=1.2.9
-pkgrel=1
-pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/wvware"
-license=('GPL')
-depends=('libgsf' 'libpng' 'sh')
-makedepends=('pkg-config')
-options=('!libtool')
-source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/wv/fix-soname.patch b/staging/wv/fix-soname.patch
deleted file mode 100644
index 81dff86e6..000000000
--- a/staging/wv/fix-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure
---- wv-1.2.7.orig//configure	2009-09-21 12:22:46.000000000 +0200
-+++ wv-1.2.7//configure	2010-06-08 12:00:27.948857203 +0200
-@@ -2082,8 +2082,8 @@
- WV_MAJOR_VERSION=1
- WV_MINOR_VERSION=2
- WV_MICRO_VERSION=7
--WV_INTERFACE_AGE=3
--WV_BINARY_AGE=3
-+WV_INTERFACE_AGE=4
-+WV_BINARY_AGE=4
- WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION
- 
- 
diff --git a/staging/wxgtk/PKGBUILD b/staging/wxgtk/PKGBUILD
deleted file mode 100644
index cc950e017..000000000
--- a/staging/wxgtk/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 146863 2012-01-18 23:43:49Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=wxgtk
-pkgver=2.8.12.1
-pkgrel=3
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
-
-build() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-#  cd "${srcdir}/wxGTK-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --disable-precomp-headers
-  make
-  make -C locale allmo
-  cd contrib/src
-  make
-}
-
-package() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-#  cd "${srcdir}/wxGTK-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  cd contrib/src
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/xaos/PKGBUILD b/staging/xaos/PKGBUILD
deleted file mode 100644
index 1240d0b00..000000000
--- a/staging/xaos/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 146867 2012-01-19 00:03:29Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xaos
-pkgver=3.5
-pkgrel=5
-pkgdesc="A fast portable real-time interactive fractal zoomer"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/xaos/"
-license=('GPL')
-depends=('gsl' 'libpng' 'aalib')
-options=('!makeflags')
-install=xaos.install
-source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch)
-sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801'
-          '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../xaos-3.5-libpng15.patch
-  ./configure --prefix=/usr --with-gsl --with-aa-driver
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/xaos/xaos-3.5-libpng15.patch b/staging/xaos/xaos-3.5-libpng15.patch
deleted file mode 100644
index beece8339..000000000
--- a/staging/xaos/xaos-3.5-libpng15.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
---- src/util/png.c
-+++ src/util/png.c
-@@ -3,6 +3,7 @@
- #include <aconfig.h>
- #ifdef USE_PNG
- #include <png.h>
-+#include <zlib.h>
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-@@ -31,6 +32,9 @@
-     png_structp png_ptr;
-     png_infop info_ptr;
-     png_color palette[256];
-+    png_color_8 sig_bit;
-+    int color_type;
-+    int bit_depth;
-     volatile unsigned short a = 255;
-     volatile unsigned char *b = (volatile unsigned char *) &a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@
- 	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	return "No memory to create png info structure";
-     }
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	fclose(file);
- 	return strerror(errno);
-@@ -78,57 +82,70 @@
-     png_set_compression_window_bits(png_ptr, 15);
-     png_set_compression_method(png_ptr, 8);
- 
--    info_ptr->width = image->width;
--    info_ptr->height = image->height;
--    /*info_ptr->gamma=1.0; */
--    info_ptr->gamma = 0.5;
--    info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
--    info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
--    info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
-+    switch (image->palette->type)
-+    {
-+    case C256:
-+	color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth = image->bytesperpixel * 8;
-+	break;
-+    case SMALLITER:
-+    case LARGEITER:
-+    case GRAYSCALE:
-+	color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth = image->bytesperpixel * 8;
-+	break;
-+    case TRUECOLOR:
-+    case TRUECOLOR24:
-+    case TRUECOLOR16:
-+	color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth = 8;
-+	break;
-+    }
- 
-+    png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
-+		  color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+		  PNG_FILTER_TYPE_BASE);
- 
-     switch (image->palette->type) {
-     case C256:
- 	{
- 	    int i;
--	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--	    info_ptr->bit_depth = image->bytesperpixel * 8;
--	    info_ptr->palette = palette;
--	    info_ptr->valid |= PNG_INFO_PLTE;
-+	    png_color png_palette[257];
-+	    int png_num_palette;
- 	    for (i = 0; i < image->palette->end; i++)
--		info_ptr->palette[i].red = image->palette->rgb[i][0],
--		    info_ptr->palette[i].green = image->palette->rgb[i][1],
--		    info_ptr->palette[i].blue = image->palette->rgb[i][2],
--		    info_ptr->num_palette = image->palette->end;
-+		png_palette[i].red = image->palette->rgb[i][0],
-+		    png_palette[i].green = image->palette->rgb[i][1],
-+		    png_palette[i].blue = image->palette->rgb[i][2],
-+		    png_num_palette = image->palette->end;
-+	    png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- 	}
- 	break;
--    case SMALLITER:
--    case LARGEITER:
--    case GRAYSCALE:
--	info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
--	info_ptr->bit_depth = image->bytesperpixel * 8;
--	break;
-     case TRUECOLOR:
-     case TRUECOLOR24:
-     case TRUECOLOR16:
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->bit_depth = 8;
--	info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
--	info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
--	info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	sig_bit.red = 8 - image->palette->info.truec.rprec;
-+	sig_bit.green = 8 - image->palette->info.truec.gprec;
-+	sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 	break;
-     }
--    info_ptr->interlace_type = 0;
-+
-+    png_write_info (png_ptr, info_ptr);
-+
- #ifdef _undefined_
-     png_set_text(png_ptr, info_ptr, comments,
- 		 sizeof(comments) / sizeof(png_text));
- #endif
- 
--    png_write_info(png_ptr, info_ptr);
-+    png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
-+    png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
-+		 (png_uint_32) (100 / image->pixelheight),
-+		 PNG_RESOLUTION_UNKNOWN);
-+
-     /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
-     png_set_packing(png_ptr);
-     if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
--	png_set_shift(png_ptr, &(info_ptr->sig_bit));
-+	png_set_shift (png_ptr, &sig_bit);
-     if (*b == 255)
- 	png_set_swap(png_ptr);
-     png_set_bgr(png_ptr);
diff --git a/staging/xaos/xaos.install b/staging/xaos/xaos.install
deleted file mode 100644
index afee50a72..000000000
--- a/staging/xaos/xaos.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(xaos.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/staging/xawtv/PKGBUILD b/staging/xawtv/PKGBUILD
deleted file mode 100644
index d2db8af63..000000000
--- a/staging/xawtv/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 147176 2012-01-23 23:36:01Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=xawtv
-pkgver=3.101
-pkgrel=2
-pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux"
-arch=('i686' 'x86_64')
-url="http://git.linuxtv.org/xawtv3.git"
-license=('GPL')
-depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm')
-makedepends=('mesa')
-source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
-md5sums=('330ce1789595e370be34ad4cae3dc3fa')
-                  
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  autoconf
-  autoheader
-  ./configure --prefix=/usr --disable-motif --disable-quicktime
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/xfce4-datetime-plugin/PKGBUILD b/staging/xfce4-datetime-plugin/PKGBUILD
deleted file mode 100644
index c4227bd32..000000000
--- a/staging/xfce4-datetime-plugin/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146891 2012-01-19 03:56:41Z foutrelis $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=xfce4-datetime-plugin
-pkgver=0.6.1
-pkgrel=2
-pkgdesc="A date and time display plugin for the Xfce panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e82f51ff0e75a63e5cbd139e43e094f9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xfce4-notes-plugin/PKGBUILD b/staging/xfce4-notes-plugin/PKGBUILD
deleted file mode 100644
index ff9642b45..000000000
--- a/staging/xfce4-notes-plugin/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146893 2012-01-19 03:57:20Z foutrelis $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Ben Mazer <contrasutra@myrealbox.com>
-
-pkgname=xfce4-notes-plugin
-pkgver=1.7.7
-pkgrel=3
-pkgdesc="A notes plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'libunique' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('42b924b23f2fec6a1099e9b7a87db4a3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xfce4-notes-plugin/xfce4-notes-plugin.install b/staging/xfce4-notes-plugin/xfce4-notes-plugin.install
deleted file mode 100644
index fee9e5d11..000000000
--- a/staging/xfce4-notes-plugin/xfce4-notes-plugin.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/staging/xfce4-quicklauncher-plugin/PKGBUILD b/staging/xfce4-quicklauncher-plugin/PKGBUILD
deleted file mode 100644
index 73de5a343..000000000
--- a/staging/xfce4-quicklauncher-plugin/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 146895 2012-01-19 03:58:10Z foutrelis $
-# Maintainer: 
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-quicklauncher-plugin
-pkgver=1.9.4
-pkgrel=6
-pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.9/${pkgname}-${pkgver}.tar.bz2
-	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
-	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
-	xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
-	xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
-	xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch)
-md5sums=('299e17f196ecfa5fb018cf65abb19b56'
-         'a7826c9f8199a2f1e914fd39b7f9e2bf'
-         '4ea4d06ab7284e78ddc4d60304f02cdf'
-         '5e8126c05def1211fb4a2a65f2812a1b'
-         '474237b205035214df1c723407251ade'
-         '9e7f789129b08c787978c7a72a55fae7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # Fedora patches
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
-  patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
-  patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
-  
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
deleted file mode 100644
index 907c1f23e..000000000
--- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- panel-plugin/quicklauncher.desktop.in.in.orig	2009-07-04 00:46:34.000000000 +0200
-+++ panel-plugin/quicklauncher.desktop.in.in	2009-07-04 00:46:51.000000000 +0200
-@@ -4,4 +4,6 @@
- _Name=Quicklauncher
- _Comment=Program with several launchers
- Icon=gnome-fs-executable
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
-+X-XFCE-Module=quicklauncher
-+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
-+X-XFCE-Unique=false
diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
deleted file mode 100644
index 96f256770..000000000
--- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
---- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
-+++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
-@@ -21181,7 +21181,7 @@
- 
- 
- 
--    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
-+    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
- 
- 
- for ac_header in locale.h
-diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
---- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
-+++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
-@@ -0,0 +1,87 @@
-+# English translation of xfce4-quicklauncher-plugin.
-+# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
-+# Jeff Bailes <thepizzaking@gmail.com>, 2007.
-+# , fuzzy
-+# 
-+# 
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: xfce4-quicklauncher-plugin\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-05-17 21:37+0200\n"
-+"PO-Revision-Date: 2007-03-31 10:17+1000\n"
-+"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
-+"Language-Team: English\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit"
-+
-+#: ../panel-plugin/callbacks.c:79
-+msgid "Configure Quicklauncher"
-+msgstr "Configure Quicklauncher"
-+
-+#: ../panel-plugin/callbacks.c:93
-+msgid "Lines: "
-+msgstr "Lines: "
-+
-+#: ../panel-plugin/callbacks.c:123
-+msgid "Espace entre les lanceurs :"
-+msgstr "Space between launchers"
-+
-+#: ../panel-plugin/callbacks.c:131
-+msgid "afficher les tooltips"
-+msgstr "Show tooltips"
-+
-+#: ../panel-plugin/callbacks.c:135
-+msgid "afficher les labels"
-+msgstr "Show labels"
-+
-+#: ../panel-plugin/callbacks.c:216
-+msgid "icone"
-+msgstr "icon"
-+
-+#: ../panel-plugin/callbacks.c:222
-+msgid "commande"
-+msgstr "command"
-+
-+#: ../panel-plugin/callbacks.c:228
-+msgid "nom"
-+msgstr "name"
-+
-+#: ../panel-plugin/callbacks.c:327
-+msgid "Open icon"
-+msgstr "Open icon"
-+
-+#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
-+msgid "Quicklauncher"
-+msgstr "Quicklauncher"
-+
-+#: ../panel-plugin/main.c:166
-+msgid "Allows you to add launchers easily and display them on many lines."
-+msgstr "Allows you to add launchers easily and display them on many lines."
-+
-+#: ../panel-plugin/main.c:168
-+msgid "Other plugins available here"
-+msgstr "Other plugins available here"
-+
-+#: ../panel-plugin/main.c:320
-+msgid "Lock"
-+msgstr "Lock"
-+
-+#: ../panel-plugin/main.c:323
-+msgid "Parameters"
-+msgstr "Parameters"
-+
-+#: ../panel-plugin/main.c:326
-+msgid "Applications"
-+msgstr "Applications"
-+
-+#: ../panel-plugin/main.c:329
-+msgid "Help"
-+msgstr "Help"
-+
-+#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
-+msgid "Program with several launchers"
-+msgstr "Program with several launchers"
-+
diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
deleted file mode 100644
index 9845ce122..000000000
--- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
-+++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
-@@ -148,6 +148,7 @@
- 	t_qck_launcher_opt_dlg* dlg;
- 	xfce_panel_plugin_block_menu(plugin);
- 	dlg = create_qck_launcher_dlg();
-+        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
- 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
- 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
- 	xfce_panel_plugin_unblock_menu(plugin);
-@@ -160,6 +161,7 @@
- 	GtkWidget *about;
- 	const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL};
- 	about = gtk_about_dialog_new();
-+        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
- 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
- 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
- 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
-@@ -461,7 +463,7 @@
- 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
- 		{
- 			g_return_val_if_fail(launcher->clicked_img, FALSE);
--			xfce_exec(launcher->command, FALSE, FALSE, NULL);
-+			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
- 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
- 		}
- 		else
diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
deleted file mode 100644
index 85dd21729..000000000
--- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
-===================================================================
---- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3779)
-+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3780)
-@@ -151,6 +151,7 @@
-         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
- 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
- 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
-+	quicklauncher_save(plugin, quicklauncher);
- 	xfce_panel_plugin_unblock_menu(plugin);
- }
- 
diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
deleted file mode 100644
index 8314d7a3c..000000000
--- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
-+++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
-@@ -320,7 +320,7 @@
- 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
- 							NULL, quicklauncher);
- 	quicklauncher_add_element(quicklauncher, launcher);
--	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
-+	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
- 							NULL, quicklauncher);
- 	quicklauncher_add_element(quicklauncher, launcher);
- 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,
diff --git a/staging/xfce4-sensors-plugin/PKGBUILD b/staging/xfce4-sensors-plugin/PKGBUILD
deleted file mode 100644
index de4048cec..000000000
--- a/staging/xfce4-sensors-plugin/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 146897 2012-01-19 03:58:55Z foutrelis $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Merk Matthias <macem@chello.at>
-
-pkgname=xfce4-sensors-plugin
-pkgver=1.2.3
-pkgrel=3
-pkgdesc="A lm_sensors plugin for the Xfce panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme') #'libxfcegui4' 
-makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools')
-optdepends=('gnu-netcat: for hddtemp access')
-options=(!libtool !makeflags)
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2edf376d140449ca42c4e4f591e626f8')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--datadir=/usr/share \
-	--datarootdir=/usr/share \
-	--disable-static \
-	--with-pathhddtemp=/usr/sbin/hddtemp \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install
deleted file mode 100644
index 17ca8f78a..000000000
--- a/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/xfig/LICENSE b/staging/xfig/LICENSE
deleted file mode 100644
index 5b38ccff8..000000000
--- a/staging/xfig/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Excerpt of the README from xfig/transfig - legal notice:
----------------------------------------------------------------------------
-
-THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-***************************************************************************
-NEW COPYRIGHT/PERMISSION NOTICE:
-
-The xfig copyright and permission notice has changed (again) slightly in
-version 3.2.5.  It now states that:
-
-	FIG : Facility for Interactive Generation of figures
-	Copyright (c) 1985-1988 by Supoj Sutanthavibul
-	Parts Copyright (c) 1989-2002 by Brian V. Smith
-	Parts Copyright (c) 1991 by Paul King
-
-	Any party obtaining a copy of these files is granted, free of charge, a
-	full and unrestricted irrevocable, world-wide, paid up, royalty-free,
-	nonexclusive right and license to deal in this software and documentation 
-	files (the "Software"), including without limitation the rights to use, 
-	copy, modify, merge, publish distribute, sublicense and/or sell copies of
-	the Software, and to permit persons who receive copies from any such 
-	party to do so, with the only requirement being that the above copyright 
-	and this permission notice remain intact.
-
-The license for 3.2.4 didn't allow selling xfig unless it was simply included in a
-collection of programs (e.g. a CD) that one was selling.
diff --git a/staging/xfig/PKGBUILD b/staging/xfig/PKGBUILD
deleted file mode 100644
index 4314a549a..000000000
--- a/staging/xfig/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 146901 2012-01-19 04:44:44Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xfig
-pkgver=3.2.5b
-pkgrel=6
-pkgdesc="An interactive drawing tool"
-arch=('i686' 'x86_64')
-url="http://www.xfig.org/userman/"
-license=('custom')
-depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'desktop-file-utils' 'gsfonts')
-makedepends=('imake')
-optdepends=('transfig: to use the frontend to convert fig files')
-options=('!makeflags' '!emptydirs')
-install=xfig.install
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
-	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
-        xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \
-        xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
-        xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \
-        xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop)
-sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542'
-          '926ad99c7221baa4aa9e9737722958860b2700fc'
-          'b7c03fb70066ff476a4039a8c0f8930c15edef68'
-          '33bff26b42ce164e79de11808b5b34b363f0d59f'
-          'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
-          '39bec6bac9746b643b05fd1286826113ede07ff6'
-          'bd76cd50be6a5789cfd6f182309cfd7056be04f3'
-          'a1285f4e61ad2eec040460ab03e8022098e7f78e'
-          '12a64ddaf65a73e23ef74f31483515a0e262768c'
-          '83032eb61c8dc96d5fc509a1ce632528457d4598'
-          '31edf4cfab708820ea3f114d095dfef5aa88e5aa'
-          '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
-
-build() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-  patch -p1 < ../xfig-3.2.4-redhat.patch
-  patch -p1 < ../xfig-3.2.5-fhs.patch
-  patch -p1 < ../xfig.3.2.5-modularX.patch
-  patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch
-  patch -p1 < ../xfig-3.2.5-color-resources.patch
-  patch -p1 < ../xfig-3.2.5-urwfonts.patch
-  patch -p1 < ../xfig-3.2.5-missing-protos.patch
-  patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch
-  patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch
-  chmod 755 Libraries
-
-  xmkmf
-  make DOCDIR=/usr/share/doc
-}
-
-package() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-  make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all
-  rm "${pkgdir}/usr/lib/X11/app-defaults"
-
-  find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \;
-  find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \;
-  find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \;
-  find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \;
-
-  install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop"
-  install -D -m644 xfig.png  "${pkgdir}/usr/share/pixmaps/xfig.png"
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"	
-}
diff --git a/staging/xfig/xfig-3.2.4-redhat.patch b/staging/xfig/xfig-3.2.4-redhat.patch
deleted file mode 100644
index da6f150b3..000000000
--- a/staging/xfig/xfig-3.2.4-redhat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- xfig.3.2.4/Fig.ad.redhat	2002-12-19 01:05:41.000000000 +0100
-+++ xfig.3.2.4/Fig.ad	2003-05-06 11:45:15.000000000 +0200
-@@ -11,7 +11,7 @@
- Fig*AllowShellResize: false
- 
- ! Image editor - can edit imported image
--Fig.image_editor:		xv
-+Fig.image_editor:		xdg-open
- 
- ! name of ghostscript (not ghostview)
- Fig.ghostscript:		gs
-@@ -20,16 +20,16 @@
- ! 		This is for viewing the xfig html reference.
- ! For netscape, this command will open the help pages in a running netscape,
- !     or start a new netscape if one isn't already running
--Fig.browser:	firefox -remote 'openFile(%f)' || firefox %f
-+Fig.browser:	xdg-open %f
- 
- ! pdfviewer - put your favorite pdf viewer here.  
- !		This is for viewing the xfig how-to guide and man pages
--Fig.pdfviewer:			xpdf %f
-+Fig.pdfviewer:			xdg-open %f
- 
- ! Spell check program - put your favorite spelling check program here.
- !		It must write the misspelled words to standard output.
- 
--Fig.spellcheckcommand:	spell %f
-+Fig.spellcheckcommand:	aspell %f
- 
- ! delay before spinner automatically counts when pressed (milliseconds)
- Fig.spinner_delay:		1000
diff --git a/staging/xfig/xfig-3.2.5-color-resources.patch b/staging/xfig/xfig-3.2.5-color-resources.patch
deleted file mode 100644
index 6cf1af906..000000000
--- a/staging/xfig/xfig-3.2.5-color-resources.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad
---- xfig.3.2.5/Fig-color.bisque.ad~	2007-11-16 13:47:45.000000000 +0100
-+++ xfig.3.2.5/Fig-color.bisque.ad	2007-11-16 13:47:52.000000000 +0100
-@@ -93,7 +93,7 @@ Fig*sideruler.background: 		gray95
- Fig*topruler.background:	 		gray95
- Fig*sideruler.background:	 		gray95
- Fig*List*background:	 			gray95
--Fig*Scrollbar.background:	 		gray95
-+! Fig*Scrollbar.background:	 		gray95
-
- Fig*cancel.background:	 			navajowhite1
- Fig*dismiss.background:	 			navajowhite1
-@@ -104,8 +104,8 @@ Fig*menu_divider.foreground:			red
- Fig*menu_divider.foreground:			red
-
- !##### Shadows
--Fig*shadowWidth:				2
--Fig*Label.shadowWidth:				1
-+! Fig*shadowWidth:				2
-+! Fig*Label.shadowWidth:				1
- Fig*horizontal.shadowWidth:	 		2
- Fig*Scrollbar.shadowWidth:			2
- ! no shadows for update indicators
-@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel:		gray80
- 
- Fig*toggle*bottomShadowPixel:			gray80
- Fig*toggle*topShadowPixel:			gray50
-+
-+! repare damage done to scrollbar shadows non color resources file
-+
-+Fig*horizontal.topShadowPixel: gray95
-+Fig*horizontal.bottomShadowPixel: gray50
-+Fig*horizontal.topShadow: gray95
-+Fig*horizontal.bottomShadow: gray50
-+
-+Fig*Scrollbar.topShadow: gray95
-+Fig*Scrollbar.bottomShadow: gray50
-+Fig*Scrollbar.topShadowPixel: gray95
-+Fig*Scrollbar.bottomShadowPixel: gray50
diff --git a/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch b/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch
deleted file mode 100644
index f4d113808..000000000
--- a/staging/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/staging/xfig/xfig-3.2.5-fhs.patch b/staging/xfig/xfig-3.2.5-fhs.patch
deleted file mode 100644
index a17d908a7..000000000
--- a/staging/xfig/xfig-3.2.5-fhs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xfig.3.2.5/Imakefile.fhs	2006-10-11 01:19:22.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:04:45.000000000 +0200
-@@ -169,8 +169,7 @@
- XFIGLIBDIR = $(LIBDIR)/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
--XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = $(DOCDIR)/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
diff --git a/staging/xfig/xfig-3.2.5-missing-protos.patch b/staging/xfig/xfig-3.2.5-missing-protos.patch
deleted file mode 100644
index 181c52a69..000000000
--- a/staging/xfig/xfig-3.2.5-missing-protos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c
---- xfig.3.2.5/u_draw.c~	2008-04-03 15:58:23.000000000 +0200
-+++ xfig.3.2.5/u_draw.c	2008-04-03 15:58:23.000000000 +0200
-@@ -43,6 +43,7 @@
- #include "w_zoom.h"
- #include "u_redraw.h"
- #include "w_cursor.h"
-+#include <X11/ImUtil.h>
- 
- static Boolean add_point(int x, int y);
- static void init_point_array(void);
diff --git a/staging/xfig/xfig-3.2.5-urwfonts.patch b/staging/xfig/xfig-3.2.5-urwfonts.patch
deleted file mode 100644
index 7bc766bd9..000000000
--- a/staging/xfig/xfig-3.2.5-urwfonts.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- xfig.3.2.4/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
-+++ new-xfig-3.2.4/u_fonts.c	2006-10-11 00:29:07.000000000 -0400
-@@ -22,41 +22,41 @@
- /* X11 font names */
- 
- struct _xfstruct x_fontinfo[NUM_FONTS] = {
--    {"-*-times-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-times-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-times-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-times-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
--    {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
--    {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
--    {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
--    {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
--    {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
--    {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
- };
- 
- /* Use the following font names for any font that doesn't exist in the table above.
diff --git a/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch b/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch
deleted file mode 100644
index 7601d20ea..000000000
--- a/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c
---- xfig.3.2.5b/f_readeps.c	2009-03-30 17:52:18.000000000 +0200
-+++ xfig.3.2.5b.new/f_readeps.c	2010-11-25 16:53:54.328247928 +0100
-@@ -252,12 +252,13 @@
- {
-     char        buf[300];
-     FILE       *tmpfp, *pixfile, *gsfile;
--    char       *psnam, *driver;
-+    char       *driver;
-     int         status, wid, ht, nbitmap, fd;
-     char        tmpfile[PATH_MAX],
- 		pixnam[PATH_MAX],
- 		errnam[PATH_MAX],
--		gscom[2 * PATH_MAX];
-+		gscom[2 * PATH_MAX],
-+		psnam[PATH_MAX];
- 
-     wid = urx - llx;
-     ht = ury - lly;
-@@ -307,19 +308,14 @@
- 	/* for color, use pcx */
- 	driver = "pcx256";
-     }
--    /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
--    if (tmpfile[0] == '/') {
--	psnam = strrchr(tmpfile, '/');
--	*psnam = 0;
--	sprintf(gscom, "cd \"%s/\";", tmpfile);
--	*psnam++ = '/';		/* Restore name for unlink() below */
--    } else {
--	psnam = tmpfile;
--	gscom[0] = '\0';
-+    /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
-+    if (!realpath(tmpfile, psnam)) {
-+	file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
-+	return False;
-     }
--    sprintf(&gscom[strlen(gscom)],
--	    "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
--	    appres.ghostscript, driver, wid, ht, pixnam, errnam);
-+    sprintf(gscom,
-+	    "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
-+	    appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
-     if (appres.DEBUG)
- 	fprintf(stderr,"calling: %s\n",gscom);
-     if ((gsfile = popen(gscom, "w")) == 0) {
diff --git a/staging/xfig/xfig-3.2.5b-libpng-1.5.patch b/staging/xfig/xfig-3.2.5b-libpng-1.5.patch
deleted file mode 100644
index 7d9c3f15e..000000000
--- a/staging/xfig/xfig-3.2.5b-libpng-1.5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: xfig.3.2.5b/f_readpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_readpng.c
-+++ xfig.3.2.5b/f_readpng.c
-@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic
-     }
- 
-     /* set long jump recovery here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	close_picfile(file,filetype);
-@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
--    else
--	png_set_gamma(png_ptr, 2.2, 0.45);
-+    png_fixed_point gamma = 0.45;
-+    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    png_set_gamma(png_ptr, 2.2, gamma);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+	png_color_16p background;
-+	png_get_bKGD(png_ptr,info_ptr,&background);
-+	png_set_background(png_ptr, background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+    }
-     else {
- 	/* blend the canvas background using the alpha channel */
- 	background.red   = x_bg_color.red >> 8;
-@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic
- 
- 	if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- 	    png_get_hIST(png_ptr, info_ptr, &histogram);
-+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5
- 	    png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+#else
-+	    png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
-+#endif
- 	}
-     }
-     if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-Index: xfig.3.2.5b/f_wrpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_wrpng.c
-+++ xfig.3.2.5b/f_wrpng.c
-@@ -20,6 +20,7 @@
- #include "w_msgpanel.h"
- #include "w_setup.h"
- #include <png.h>
-+#include <zlib.h>
- 
- /*
-  * Write PNG file from rgb data
-@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat
-     }
- 
-     /* set long jump recovery here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return False;
diff --git a/staging/xfig/xfig.3.2.5-modularX.patch b/staging/xfig/xfig.3.2.5-modularX.patch
deleted file mode 100644
index 3b5ac5937..000000000
--- a/staging/xfig/xfig.3.2.5-modularX.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- xfig.3.2.5/Imakefile.modularX	2007-04-16 14:27:49.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:29:18.000000000 +0200
-@@ -45,7 +45,7 @@
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
- 
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /usr/share/X11/app-defaults
- 
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -166,12 +166,12 @@
- XCOMM XFIGLIBDIR = $(LIBDIR)
- 
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = /usr/share/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XFIGDOCDIR = $(DOCDIR)/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-+MANDIR = /usr/share/man/man1
- XCOMM MANDIR = /usr/local/xfig/man
-
- XCOMM If your system doesn't have strstr undefine the following definition
diff --git a/staging/xfig/xfig.desktop b/staging/xfig/xfig.desktop
deleted file mode 100644
index c634a28e9..000000000
--- a/staging/xfig/xfig.desktop
+++ /dev/null
@@ -1,47 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=xfig
-Icon=xfig
-Type=Application
-Name=Xfig
-Name[eo]=XDesegno
-Name[et]=Ffig
-Name[ja]=xfig
-Name[no]=X-figur
-Comment=Xfig drawing application
-Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå
-Comment[ca]=Aplicació de dibuix Xfig
-Comment[cs]=Aplikace pro kreslení vektorových obrázků
-Comment[da]=Xfig tegneprogram
-Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Xfig
-Comment[eo]=Desegnilo "Xfig"
-Comment[es]=Aplicación de diseño vectorial (objetos)
-Comment[et]=XFig joonistusprogramm
-Comment[fi]=Xfig vektoripiirto-ohjelma
-Comment[fr]=Programme de dessin objet Xfig
-Comment[gl]=Aplicación de debuxo (obxectos)
-Comment[he]=Xfig רויצה םושיי
-Comment[hr]=Program za crtanje
-Comment[hu]=Rajzolóprogram
-Comment[is]=Hlutbundið teikniforrit
-Comment[it]=Applicazione di disegno Xfig
-Comment[lt]=Xfig braižymo programa
-Comment[mk]=Едноставна апликација за векторско цртање
-Comment[nl]=Xfig-tekenprogramma
-Comment[no]=Xfig-tegneprogram
-Comment[no_NY]=Teikneprogrammet Xfig
-Comment[pl]=Aplikacja do kreślenia
-Comment[pt]=Aplicação de desenho
-Comment[ro]=Program de desenare vectorială
-Comment[ru]=Приложения для рисования векторной графики
-Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
-Comment[sl]=Program za risanje Xfig
-Comment[sr]=Xfig prgram za vektorsko crtanje
-Comment[sv]=Xfig ritprogram
-Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
-Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Xfig
-Comment[zh_CN.GB2312]=Xfig 绘图应用程序
diff --git a/staging/xfig/xfig.install b/staging/xfig/xfig.install
deleted file mode 100644
index f01585f79..000000000
--- a/staging/xfig/xfig.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
- }
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/xine-ui/PKGBUILD b/staging/xine-ui/PKGBUILD
deleted file mode 100644
index ac3016952..000000000
--- a/staging/xine-ui/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 146917 2012-01-19 05:44:29Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-ui
-pkgver=0.99.6
-pkgrel=5
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm'
-	 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
-	 'desktop-file-utils' 'lirc-utils')
-makedepends=('libxt')
-options=('!strip')
-install=xine-ui.install
-source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
-	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch 
-        fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch)
-sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
-          'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
-          '8bbd39f61de7b6991385457a4944b8ea104da88b'
-          '2361df9ddad59c426b0f863414c6d527b463a38a'
-          '9c70c6543dae6815710b239b4638ffe3843bac86'
-          'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch"
-  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
-  patch -p1 < "${srcdir}/fix_lirc.diff"
-  patch -p1 < "${srcdir}/xine-ui-xdg.diff"
-  patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch"
-  sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
-  autoconf
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-x --enable-lirc --without-aalib --enable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install
-}
diff --git a/staging/xine-ui/fix_lirc.diff b/staging/xine-ui/fix_lirc.diff
deleted file mode 100644
index 93890cb5c..000000000
--- a/staging/xine-ui/fix_lirc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/m4/_xine.m4 b/m4/_xine.m4
---- a/m4/_xine.m4
-+++ b/m4/_xine.m4
-@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC],
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
-           AC_CHECK_FILE(["$llirc/liblirc_client.so"],
--             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             [LIRC_LIBS="$llirc/liblirc_client.so"
-+              found_lirc=yes]
-              AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-              AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-                 [LIRC_LIBS="$llirc/liblirc_client.a"
diff --git a/staging/xine-ui/lirc-check-a89347673097.patch b/staging/xine-ui/lirc-check-a89347673097.patch
deleted file mode 100644
index c1c8d2614..000000000
--- a/staging/xine-ui/lirc-check-a89347673097.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268754560 0
-# Node ID a89347673097053d89675e991ab403cda04d94cd
-# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11
-Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing.
-
---- a/m4/_xine.m4	Sun Mar 14 18:04:46 2010 +0000
-+++ b/m4/_xine.m4	Tue Mar 16 15:49:20 2010 +0000
-@@ -25,14 +25,14 @@
- dnl
- AC_DEFUN([AC_CHECK_LIRC],
-   [AC_ARG_ENABLE(lirc,
--     [  --disable-lirc          Turn off LIRC support.],
--     [], enable_lirc=yes)
-+     [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])],
-+     [given=Y], [given=N; enable_lirc=yes])
- 
-   found_lirc=no
-   if test x"$enable_lirc" = xyes; then
-     have_lirc=yes
--    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [])
--    if test "$LIRC_CFLAGS" != ''; then
-+    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:])
-+    if test "$found_lirc" = yes; then
-       LIRC_INCLUDE="$LIRC_CFLAGS"
-     else
-      AC_REQUIRE_CPP
-@@ -42,15 +42,20 @@
- 
-         if test x"$LIRC_PREFIX" != "x"; then
-            lirc_libprefix="$LIRC_PREFIX/lib"
--  	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-+	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
--          AC_CHECK_FILE(["$llirc/liblirc_client.a"],
--            [LIRC_LIBS="$llirc/liblirc_client.a"
--             found_lirc=yes],,)
-+          AC_CHECK_FILE(["$llirc/liblirc_client.so"],
-+             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-+             AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-+                [LIRC_LIBS="$llirc/liblirc_client.a"
-+                 found_lirc=yes],,)
-+          )
-         done
-      else
--         AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
-+	test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available])
-+	AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***])
-      fi
-     fi
-   fi
-@@ -59,7 +64,6 @@
-      fi
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
--     AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"])
- ])
- 
- dnl AC_C_ATTRIBUTE_ALIGNED
-
diff --git a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch
deleted file mode 100644
index daad4f03a..000000000
--- a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268758696 0
-# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514
-# Parent 882c464d4a650d09da37ade366face74452c1897
-Restore definition of HAVE_LIRC for use in makefiles.
-
---- a/m4/_xine.m4	Mon Mar 15 12:03:01 2010 -0700
-+++ b/m4/_xine.m4	Tue Mar 16 16:58:16 2010 +0000
-@@ -62,6 +62,7 @@
-      if test "$found_lirc" = yes; then
- 	AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed])
-      fi
-+     AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes])
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
- ])
-
diff --git a/staging/xine-ui/xine-ui-0.99.6-libpng15.patch b/staging/xine-ui/xine-ui-0.99.6-libpng15.patch
deleted file mode 100644
index 6a5fb5522..000000000
--- a/staging/xine-ui/xine-ui-0.99.6-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-===================================================================
---- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
-+++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/staging/xine-ui/xine-ui-xdg.diff b/staging/xine-ui/xine-ui-xdg.diff
deleted file mode 100644
index 959d674b2..000000000
--- a/staging/xine-ui/xine-ui-xdg.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- xine-ui-0.99.6.orig/src/xitk/common.h
-+++ xine-ui-0.99.6/src/xitk/common.h
-@@ -331,6 +331,5 @@ typedef struct {
-   int                       use_root_window;
- 
-   int                       ssaver_enabled;
--  int                       ssaver_timeout;
- 
-   int                       skip_by_chapter;
---- xine-ui-0.99.6.orig/src/xitk/main.c
-+++ xine-ui-0.99.6/src/xitk/main.c
-@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
-   if (sigprocmask (SIG_BLOCK,  &vo_mask, NULL))
-     fprintf (stderr, "sigprocmask() failed.\n");
- 
-+  signal(SIGCHLD, SIG_IGN);
-+
-   gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
-   
-   gGui->stream                 = NULL;
---- xine-ui-0.99.6.orig/src/xitk/panel.c
-+++ xine-ui-0.99.6/src/xitk/panel.c
-@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
-  * Update slider thread.
-  */
- static void *slider_loop(void *dummy) {
--  int screensaver_timer = 0;
-   int status, speed;
-   int pos, secs;
-   int i = 0;
-@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
- 	else
- 	  video_window_set_mrl((char *)gGui->mmk.mrl);
- 	
--	if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
--	  
--	  if(gGui->ssaver_timeout) {
--	    
--	    if(!(i % 2))
--	      screensaver_timer++;
--	    
--	    if(screensaver_timer >= gGui->ssaver_timeout) {
--	      screensaver_timer = 0;
--	      video_window_reset_ssaver();
--	      
--	    }
--	  }  
--	}
-+       video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
- 
- 	if(gGui->logo_mode == 0) {
- 	  
-@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
- 	    stream_infos_update_infos();
- 
- 	}
-+      } else {
-+       video_window_suspend_ssaver(0);
-       }
-     }
-     
---- xine-ui-0.99.6.orig/src/xitk/videowin.c
-+++ xine-ui-0.99.6/src/xitk/videowin.c
-@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
- 
-   /* The old window should be destroyed now */
-   if(old_video_window != None) {
-+    /* Screensaver control is tied to our window id */
-+    video_window_suspend_ssaver(0);
-+
-     XDestroyWindow(gGui->video_display, old_video_window);
-      
-     if(gGui->cursor_grabbed)
-@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
- 
- }
- 
--void video_window_reset_ssaver(void) {
-+void video_window_suspend_ssaver(int do_suspend) {
-+  static int was_suspended;
- 
--  if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
-+  do_suspend = do_suspend && gGui->ssaver_enabled;
- 
--#ifdef HAVE_XTESTEXTENSION
--    if(gVw.have_xtest == True) {
--      
--      gVw.fake_key_cur++;
--      
--      if(gVw.fake_key_cur >= 2)
--	gVw.fake_key_cur = 0;
--
--      XLockDisplay(gGui->video_display);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
--      XSync(gGui->video_display, False);
--      XUnlockDisplay(gGui->video_display);
-+  if(was_suspended != do_suspend) {
-+    if(fork() == 0) {
-+      char window_id[30];
-+      char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
-+      int fd;
-+
-+      for(fd = 3; fd < 256; fd++)
-+	close(fd);
-+
-+      args[1] = do_suspend ? "suspend" : "resume";
-+      sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
-+      execvp(args[0], args);
-+      _exit(0);
-     }
--    else 
--#endif
--    {
--      /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
--      /* assuming its location and permission will not change during run time of xine-ui. */
--      {
--	static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
--	static char *gssaver_path   = NULL;
--
--	if(!gssaver_path) {
--	  char *path = getenv("PATH");
--
--	  if(!path)
--	    path = "/usr/local/bin:/usr/bin";
--	  do {
--	    char *p, *pbuf;
--	    int   plen;
--
--	    for(p = path; *path && *path != ':'; path++)
--	      ;
--	    if(p == path)
--	      plen = 1, p = ".";
--	    else
--	      plen = path - p;
--	    asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
--	    if ( access(pbuf, X_OK) ) {
--	      free(pbuf);
--	      gssaver_path = "";
--	    } else
--	      gssaver_path = pbuf;
--	  } while(!gssaver_path[0] && *path++);
--	}
--	if(gssaver_path[0] && (fork() == 0)) {
--	  execv(gssaver_path, gssaver_args);
--	  exit(0);
--	}
--      }
- 
--      XLockDisplay(gGui->video_display);
--      XResetScreenSaver(gGui->video_display);
--      XUnlockDisplay(gGui->video_display);
--    }
-+    was_suspended = do_suspend;
-   }
- }
- 
-+void video_window_reset_ssaver(void) {
-+  video_window_suspend_ssaver(1);
-+}
-+
- void video_window_get_frame_size(int *w, int *h) {
-   if(w)
-     *w = gVw.frame_width;
---- xine-ui-0.99.6.orig/src/xitk/videowin.h
-+++ xine-ui-0.99.6/src/xitk/videowin.h
-@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
- void video_window_update_logo(void);
- void video_window_change_skins(int);
- 
-+void video_window_suspend_ssaver(int do_suspend);
- void video_window_reset_ssaver(void);
- 
- void video_window_get_frame_size(int *w, int *h);
---- xine-ui-0.99.6.orig/src/xitk/event.c
-+++ xine-ui-0.99.6/src/xitk/event.c
-@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
-   gGui->skip_by_chapter = cfg->num_value;
-   panel_update_nextprev_tips();
- }
--static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
--  gGui->ssaver_timeout = cfg->num_value;
--}
- 
- static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
-   
-@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
- 					 snapshot_loc_cb,
- 					 CONFIG_NO_DATA);
-   
--  gGui->ssaver_timeout =
--    xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
--			      _("Screensaver reset interval (s)"),
--			      _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
--			      CONFIG_LEVEL_ADV,
--			      ssaver_timeout_cb,
--			      CONFIG_NO_DATA);
--  
-   gGui->skip_by_chapter = 
-     xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
- 			       _("Chapter hopping"),
-
-
-
-
- 
diff --git a/staging/xine-ui/xine-ui.install b/staging/xine-ui/xine-ui.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/staging/xine-ui/xine-ui.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/xorg-xcursorgen/PKGBUILD b/staging/xorg-xcursorgen/PKGBUILD
deleted file mode 100644
index 630794be0..000000000
--- a/staging/xorg-xcursorgen/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 147178 2012-01-24 01:21:47Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-xcursorgen
-pkgver=1.0.4
-pkgrel=3
-pkgdesc="Create an X cursor file from PNG images"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libx11' 'libxcursor' 'libpng')
-makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2)
-sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a')
-
-build() {
-  cd "${srcdir}/xcursorgen-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/xcursorgen-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xsane/PKGBUILD b/staging/xsane/PKGBUILD
deleted file mode 100644
index aa022720b..000000000
--- a/staging/xsane/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 147252 2012-01-25 03:22:07Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgbase=xsane
-pkgname=('xsane' 'xsane-gimp')
-pkgver=0.998
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.xsane.org"
-license=('GPL2')
-makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
-source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
-	xsane-0.995-xdg-open.patch)
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
-         '15541ff0ddc10acfa2059cf99d5478eb')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora
-  patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch"
-  sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp
-  make
-  mv src/xsane src/xsane-gimp
-
-  # build again with gimp enabled
-  make clean
-  ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
-  make
-}
-
-package_xsane() {
-  pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp."
-  install=$pkgname.install
-  depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')  
-  optdepends=('xsane-gimp: for gimp plugin support')
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_xsane-gimp() {
-  pkgdesc="XSane Gimp plugin"
-  depends=('xsane' 'gimp')
-  cd "$srcdir/$pkgbase-$pkgver"
-  install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp"
-
-  ## For making Gimp Plugin available 
-  /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
-  cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
-  /bin/ln -s ../../../../bin/xsane-gimp xsane
-
-# http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup
-# when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, 
-# gentoo has something similar
-#%post gimp
-#107 	if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
-#108 	%{_sbindir}/gimp-plugin-mgr --install xsane
-#109 	fi
-#110 	
-#111 	%preun gimp
-#112 	if [ $1 = 0 ]; then
-#113 	if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
-#114 	%{_sbindir}/gimp-plugin-mgr --uninstall xsane
-#115 	fi
-#116 	fi 
-}
diff --git a/staging/xsane/xsane-0.995-xdg-open.patch b/staging/xsane/xsane-0.995-xdg-open.patch
deleted file mode 100644
index db1f9bd68..000000000
--- a/staging/xsane/xsane-0.995-xdg-open.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
---- xsane-0.995/src/xsane.h.xdg-open	2007-08-13 09:20:32.000000000 +0200
-+++ xsane-0.995/src/xsane.h	2007-11-23 11:50:49.000000000 +0100
-@@ -251,7 +251,7 @@
- # elif defined(HAVE_OS2_H)
- #  define DEFAULT_BROWSER "netscape"
- # else
--#  define DEFAULT_BROWSER "netscape"
-+#  define DEFAULT_BROWSER "xdg-open"
- # endif
- #endif
- 
diff --git a/staging/xsane/xsane.install b/staging/xsane/xsane.install
deleted file mode 100644
index aa3e3b8f8..000000000
--- a/staging/xsane/xsane.install
+++ /dev/null
@@ -1,16 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_install() {
-  echo "NOTE:"
-  echo "  If you experience any problems after installing xsane "
-  echo "  it may help to remove the setup and preferences files"
-  echo "  of xsane:"
-  echo ""
-  echo "    \$ rm -rf ~/.sane/xsane"
-  echo ""
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/staging/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch b/staging/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch
deleted file mode 100644
index dc93a2e8a..000000000
--- a/staging/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-# HG changeset patch
-# User Glenn Randers-Pehrson <glennrp+bmo@gmail.com>
-# Date 1320490106 0
-# Node ID aff1bd412058cb6926a8feae1e8c0fc76b4c04a3
-# Parent  8248dbffd64534fb6c65ad3d757b795119e783c6
-Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15.  We access pixel_depth via png_get_IHDR() instead; r=joedrew
-
-diff --git a/modules/libpr0n/decoders/nsICODecoder.cpp b/modules/libpr0n/decoders/nsICODecoder.cpp
---- a/modules/libpr0n/decoders/nsICODecoder.cpp
-+++ b/modules/libpr0n/decoders/nsICODecoder.cpp
-@@ -381,18 +381,17 @@ nsICODecoder::WriteInternal(const char* 
-       return;
-     }
-     mPos += aCount;
-     aBuffer += aCount;
-     aCount = 0;
- 
-     // Raymond Chen says that 32bpp only are valid PNG ICOs
-     // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
--    if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && 
--        static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
-+    if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
-       PostDataError();
-     }
-     return;
-   }
- 
-   // We've processed all of the icon dir entries and are within the 
-   // bitmap info size
-   if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset && 
-diff --git a/modules/libpr0n/decoders/nsPNGDecoder.h b/modules/libpr0n/decoders/nsPNGDecoder.h
---- a/modules/libpr0n/decoders/nsPNGDecoder.h
-+++ b/modules/libpr0n/decoders/nsPNGDecoder.h
-@@ -68,29 +68,35 @@ public:
- 
-   void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
-                    PRInt32 width, PRInt32 height,
-                    gfxASurface::gfxImageFormat format);
-   void SetAnimFrameInfo();
- 
-   void EndImageFrame();
- 
--  // Checks if the info header contains valid information
--  bool HasValidInfo() const 
-+  // Check if PNG is valid ICO (32bpp RGBA)
-+  // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-+  bool IsValidICO() const
-   {
--    return mInfo && mInfo->valid;
--  }
-+    png_uint_32
-+        png_width,  // Unused
-+        png_height; // Unused
- 
--  // Obtain the pixel depth if available or 0 otherwise
--  PRInt32 GetPixelDepth() const
--  {
--    if (!mInfo) {
--      return 0;
-+    int png_bit_depth,
-+        png_color_type;
-+
-+    if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
-+                     &png_color_type, NULL, NULL, NULL)) {
-+
-+      return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-+              png_bit_depth == 8);
-+    } else {
-+      return false;
-     }
--    return mInfo->pixel_depth;
-   }
- 
- public:
-   png_structp mPNG;
-   png_infop mInfo;
-   nsIntRect mFrameRect;
-   PRUint8 *mCMSLine;
-   PRUint8 *interlacebuf;
-
-
diff --git a/staging/xulrunner/PKGBUILD b/staging/xulrunner/PKGBUILD
deleted file mode 100644
index e67045542..000000000
--- a/staging/xulrunner/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 148014 2012-01-29 21:53:25Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=xulrunner
-pkgver=9.0.1
-pkgrel=2
-pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2
-        mozconfig
-        mozilla-pkgconfig.patch
-        5007_fix_libpr0n_nsPNGDecoder.patch)
-options=('!emptydirs')
-replaces=('xulrunner-oss')
-md5sums=('7cf2bd379792a9b232267c6a79680566'
-         '8dfb78c5bd0581c8cf4753813132bf0b'
-         '27271ce647a83906ef7a24605e840d61'
-         '6f3be4f4ac0217d0782b1a0770d80f28')
-
-build() {
-  cd "$srcdir/mozilla-release"
-  cp "$srcdir/mozconfig" .mozconfig
-
-  #fix libdir/sdkdir - fedora
-  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-
-  patch -Np1 -i "$srcdir/5007_fix_libpr0n_nsPNGDecoder.patch"
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "$srcdir/mozilla-release"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation"
-
-  # add xulrunner library path to ld.so.conf
-  install -d $pkgdir/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
-  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py"
-}
diff --git a/staging/xulrunner/mozconfig b/staging/xulrunner/mozconfig
deleted file mode 100644
index 82a6ae512..000000000
--- a/staging/xulrunner/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/staging/xulrunner/mozilla-pkgconfig.patch b/staging/xulrunner/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/staging/xulrunner/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in	2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in	2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/staging/zvbi/PKGBUILD b/staging/zvbi/PKGBUILD
deleted file mode 100644
index 442df8b76..000000000
--- a/staging/zvbi/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 146940 2012-01-19 13:11:45Z giovanni $
-# Maintainer: 
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=zvbi
-pkgver=0.2.33
-pkgrel=4
-pkgdesc="VBI capture and decoding library"
-url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
-arch=('i686' 'x86_64')
-depends=('libpng' 'libx11')
-license=('GPL')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
-        'fix-includes.patch'
-        'zvbi-0.2.33-libpng15.patch')
-md5sums=('1741a6045c3eedfb611d645f2da69ac8'
-         '38766bc59e1571133d0399f0102da653'
-         '4434de7addc438be8c5a33274146bd11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/fix-includes.patch"
-  patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
-
-  ./configure --prefix=/usr \
-              --disable-static \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/zvbi/fix-includes.patch b/staging/zvbi/fix-includes.patch
deleted file mode 100644
index 28252649e..000000000
--- a/staging/zvbi/fix-includes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add proper #includes so that we do not get undef errors to S_ISCHR
-during linking.
-
-Signed-off-by: Alex Chiang <achiang@canonical.com>
----
---- zvbi-0.2.33.orig/src/io-dvb.c
-+++ zvbi-0.2.33/src/io-dvb.c
-@@ -29,6 +29,8 @@
- #include <errno.h>
- #include <sys/select.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #ifndef HAVE_S64_U64
-   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
---- zvbi-0.2.33.orig/src/io-v4l.c
-+++ zvbi-0.2.33/src/io-v4l.c
-@@ -42,6 +42,7 @@ static const char rcsid [] =
- #include <assert.h>
- #include <sys/time.h>		/* timeval */
- #include <sys/types.h>		/* fd_set, uid_t */
-+#include <sys/stat.h>		/* S_ISCHR */
- #include <sys/ioctl.h>		/* for (_)videodev.h */
- #include <pthread.h>
- 
---- zvbi-0.2.33.orig/contrib/ntsc-cc.c
-+++ zvbi-0.2.33/contrib/ntsc-cc.c
-@@ -34,6 +34,7 @@
- #include <locale.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #ifdef HAVE_GETOPT_LONG
- #  include <getopt.h>
diff --git a/staging/zvbi/zvbi-0.2.33-libpng15.patch b/staging/zvbi/zvbi-0.2.33-libpng15.patch
deleted file mode 100644
index 262677376..000000000
--- a/staging/zvbi/zvbi-0.2.33-libpng15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: src/exp-gfx.c
-===================================================================
-RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
-retrieving revision 1.16
-diff -u -B -r1.16 exp-gfx.c
---- src/exp-gfx.c	24 Feb 2008 14:17:47 -0000	1.16
-+++ src/exp-gfx.c	15 Feb 2011 20:03:58 -0000
-@@ -1672,11 +1672,11 @@
- 	char title[80];
- 	unsigned int i;
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_ptr)))
- 		return FALSE;
- 
- 	png_set_write_fn (png_ptr,
--			  (voidp) gfx,
-+			  (png_voidp) gfx,
- 			  write_data,
- 			  flush_data);
- 
diff --git a/testing/apr-util/PKGBUILD b/testing/apr-util/PKGBUILD
deleted file mode 100644
index 10e6747cc..000000000
--- a/testing/apr-util/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 146323 2012-01-09 18:52:02Z stephane $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apr-util
-pkgver=1.3.12
-pkgrel=5
-pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
-url="http://apr.apache.org/"
-depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
-options=('!libtool')
-license=('APACHE')
-source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('0f671b037ca62751a8a7005578085560')
-
-build() {
-  cd "${srcdir}/apr-util-${pkgver}"
-  ./configure --prefix=/usr --with-apr=/usr \
-    --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
-    --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
-  make
-}
-
-package() {
-  cd "${srcdir}/apr-util-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/bogofilter/PKGBUILD b/testing/bogofilter/PKGBUILD
deleted file mode 100644
index b5c9d346b..000000000
--- a/testing/bogofilter/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146325 2012-01-09 18:52:04Z stephane $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
-
-pkgname=bogofilter
-pkgver=1.2.2
-pkgrel=4
-pkgdesc="A fast Bayesian spam filtering tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://bogofilter.sourceforge.net"
-depends=('db' 'perl' 'gsl')
-backup=('etc/bogofilter/bogofilter.cf')
-source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/bogofilter  \
-              --localstatedir=/var \
-              --enable-transactions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
-
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
-  install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
-}
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
deleted file mode 100644
index 6c96cea06..000000000
--- a/testing/btrfs-progs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146653 2012-01-15 12:27:09Z tpowa $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=btrfs-progs
-pkgver=0.19.20120110
-pkgrel=2
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
-url="http://btrfs.wiki.kernel.org/"
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-
-build() {
-   cd $srcdir/$pkgname
-   make CFLAGS="$CFLAGS" all convert
-}
-
-package() {
-   cd $srcdir/$pkgname
-   make prefix=$pkgdir/usr install
-   # fix manpage
-   mkdir -p $pkgdir/usr/share/
-   mv $pkgdir/usr/man $pkgdir/usr/share/man
-   mkdir -p ${pkgdir}/sbin
-   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-}
-md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2')
diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD
deleted file mode 100644
index 5c8292530..000000000
--- a/testing/claws-mail-extra-plugins/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 145936 2012-01-04 13:11:30Z dreisner $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Mildred <mildred593 at online dot fr>
-
-pkgname=claws-mail-extra-plugins
-pkgver=3.8.0
-pkgrel=2
-pkgdesc="Extra plugins for claws-mail"
-url="http://www.claws-mail.org/plugins.php?branch=EXT"
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('claws-mail>=3.8.0')
-makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
-             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
-             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
-optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
-            'perl: for perl plugin'
-            'libnotify: for notification plugin'
-            'libcanberra: for notification plugin'
-            'dbus-core: for notification plugin'
-            'libxml2: for gtkhtml2_viewer and rssyl plugins'
-            'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
-            'libarchive: for archive plugin'
-            'libytnef: for tnef_parse plugin'
-            'libwebkit: for the fancy webkit html plugin'
-            'libsoup-gnome: for the fancy webkit html plugin'
-            'python2: for python plugin'
-	    'libgdata: for gdata plugin')
-conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
-           'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
-           'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
-           'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
-replaces=('sylpheed-claws-extra-plugins')
-options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
-md5sums=('4776f6e0357a694f384349ac73b6da52')
-
-build() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-
-  # fix for python2
-  export PYTHON="/usr/bin/python2"
-
-  # fix gdata plugin build
-  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure
- 
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && (
-      cd $dir
-
-      ./configure --prefix=/usr --disable-static
-      make
-    )
-  done
-}
-
-package() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && 
-      make -C $dir DESTDIR="$pkgdir" install
-  done
-
-  # fix fileconflict with libical, #11485
-  rm -f "$pkgdir/usr/include/ical.h"
-}
diff --git a/testing/claws-mail/PKGBUILD b/testing/claws-mail/PKGBUILD
deleted file mode 100644
index c74af0279..000000000
--- a/testing/claws-mail/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 146327 2012-01-09 18:52:06Z stephane $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=claws-mail
-pkgver=3.8.0
-pkgrel=2
-pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
-         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
-optdepends=('python2:           needed for some tools'
-            'perl:              needed for some tools'
-            'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering')
-replaces=('sylpheed-claws')
-provides=('claws')
-options=(!libtool)
-install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('df9f1657d7f34959a2205344d952c2e3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-
-  ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --disable-dillo-viewer-plugin \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --enable-jpilot
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # build and install extra tools
-  cd tools
-  make
-   # all executables and .conf files ; only top directory
-  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-      install -D -m755 ${i} \
-        ${pkgdir}/usr/lib/claws-mail/tools/${i}
-  done
-}
diff --git a/testing/claws-mail/claws-mail.install b/testing/claws-mail/claws-mail.install
deleted file mode 100644
index a6ae1eae6..000000000
--- a/testing/claws-mail/claws-mail.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
diff --git a/testing/cmake/PKGBUILD b/testing/cmake/PKGBUILD
deleted file mode 100644
index 14ef6ab43..000000000
--- a/testing/cmake/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 145938 2012-01-04 13:11:32Z dreisner $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=cmake
-pkgver=2.8.7
-pkgrel=2
-pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.cmake.org"
-depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt')
-optdepends=('qt: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e1b237aeaed880f65dec9c20602452f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  ./bootstrap --prefix=/usr \
-    --mandir=/share/man \
-    --docdir=/share/doc/cmake \
-    --system-libs \
-    --qt-gui \
-    --parallel=2
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  vimpath="$pkgdir/usr/share/vim/vimfiles"
-  install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
-  install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
-  install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
-  install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/cmake/cmake.install b/testing/cmake/cmake.install
deleted file mode 100644
index 55f6c843b..000000000
--- a/testing/cmake/cmake.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD
deleted file mode 100644
index 8748cc984..000000000
--- a/testing/coreutils/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 146285 2012-01-08 06:48:18Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=coreutils
-pkgver=8.15
-pkgrel=1
-pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/coreutils"
-groups=('base')
-depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap')
-replaces=('mktemp')
-backup=('etc/pam.d/su')
-install=${pkgname}.install
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-	coreutils-uname.patch
-	coreutils-pam.patch
-	su.pam)
-md5sums=('094909fafa86110140b32e4948941545'
-         '2cdd273d93a77d03739fa81d7c2acfe5'
-         'c4fcca138b6abf6d443d48a6f0cd8833'
-         'aad79a2aa6d566c375d7bdd1b0767278'
-         'fa85e5cce5d723275b14365ba71a8aad')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # added su wheel group pam patch (from fedora git)
-  patch -Np1 -i ${srcdir}/coreutils-pam.patch
-
-  # linux specific uname improvement (from gentoo portage)
-  patch -Np1 -i ${srcdir}/coreutils-uname.patch
-
-  autoreconf -v
-  ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
-              --enable-install-program=su \
-              --enable-no-install-program=groups,hostname,kill,uptime \
-              --enable-pam
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make RUN_EXPENSIVE_TESTS=yes check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  cd ${pkgdir}/usr/bin
-  install -dm755 ${pkgdir}/{bin,usr/sbin}
-  
-  # binaries required by FHS
-  _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \
-        mkdir mknod mv pwd rm rmdir stty su sync true uname"
-  mv ${_fhs} ${pkgdir}/bin
-
-  # binaries required by various Arch scripts
-  _bin="cut dir dircolors du install mkfifo readlink shred \
-        sleep touch tr vdir"
-  mv ${_bin} ${pkgdir}/bin
-  ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
-
-  mv chroot ${pkgdir}/usr/sbin
-  install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su
-}
diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch
deleted file mode 100644
index e61908f3f..000000000
--- a/testing/coreutils/coreutils-pam.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac
---- coreutils-8.4-orig/configure.ac	2010-01-11 18:20:42.000000000 +0100
-+++ coreutils-8.4/configure.ac	2010-02-12 10:17:46.000000000 +0100
-@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then
-   AC_SUBST([GNULIB_WARN_CFLAGS])
- fi
- 
-+dnl Give the chance to enable PAM
-+AC_ARG_ENABLE(pam, dnl
-+[  --enable-pam              Enable use of the PAM libraries],
-+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
-+LIB_PAM="-ldl -lpam -lpam_misc"
-+AC_SUBST(LIB_PAM)])
-+
- AC_FUNC_FORK
- 
- optional_bin_progs=
-diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi
---- coreutils-8.4-orig/doc/coreutils.texi	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/doc/coreutils.texi	2010-02-12 10:17:46.000000000 +0100
-@@ -15081,8 +15081,11 @@ to certain shells, etc.).
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts.  (If the system
--supports @code{syslog}.)  However, GNU @command{su} does not check if the
--user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication.  You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
- 
- The program accepts the following options.  Also see @ref{Common options}.
- 
-@@ -15124,6 +15127,8 @@ environment variables except @env{TERM},
- @env{PATH} to a compiled-in default value.  Change to @var{user}'s home
- directory.  Prepend @samp{-} to the shell's name, intended to make it
- read its login startup file(s).
-+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables 
-+are preserved as well for PAM functionality.
- 
- @item -m
- @itemx -p
-@@ -15163,33 +15168,6 @@ Exit status:
- the exit status of the subshell otherwise
- @end display
- 
--@cindex wheel group, not supported
--@cindex group wheel, not supported
--@cindex fascism
--@subsection Why GNU @command{su} does not support the @samp{wheel} group
--
--(This section is by Richard Stallman.)
--
--@cindex Twenex
--@cindex MIT AI lab
--Sometimes a few of the users try to hold total power over all the
--rest.  For example, in 1984, a few users at the MIT AI lab decided to
--seize power by changing the operator password on the Twenex system and
--keeping it secret from everyone else.  (I was able to thwart this coup
--and give power back to the users by patching the kernel, but I
--wouldn't know how to do that in Unix.)
--
--However, occasionally the rulers do tell someone.  Under the usual
--@command{su} mechanism, once someone learns the root password who
--sympathizes with the ordinary users, he or she can tell the rest.  The
--``wheel group'' feature would make this impossible, and thus cement the
--power of the rulers.
--
--I'm on the side of the masses, not that of the rulers.  If you are
--used to supporting the bosses and sysadmins in whatever they do, you
--might find this idea strange at first.
--
--
- @node timeout invocation
- @section @command{timeout}: Run a command with a time limit
- 
-diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am
---- coreutils-8.4-orig/src/Makefile.am	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/src/Makefile.am	2010-02-12 10:17:46.000000000 +0100
-@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP)
- uptime_LDADD += $(GETLOADAVG_LIBS)
- 
- # for crypt
--su_LDADD += $(LIB_CRYPT)
-+su_LDADD += $(LIB_CRYPT) @LIB_PAM@
- 
- # for various ACL functions
- copy_LDADD += $(LIB_ACL)
-diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c
---- coreutils-8.4-orig/src/su.c	2010-02-12 10:15:15.000000000 +0100
-+++ coreutils-8.4/src/su.c	2010-02-12 10:24:29.000000000 +0100
-@@ -37,6 +37,16 @@
-    restricts who can su to UID 0 accounts.  RMS considers that to
-    be fascist.
- 
-+#ifdef USE_PAM
-+
-+   Actually, with PAM, su has nothing to do with whether or not a
-+   wheel group is enforced by su.  RMS tries to restrict your access
-+   to a su which implements the wheel group, but PAM considers that
-+   to be fascist, and gives the user/sysadmin the opportunity to
-+   enforce a wheel group by proper editing of /etc/pam.conf
-+
-+#endif
-+
-    Compile-time options:
-    -DSYSLOG_SUCCESS	Log successful su's (by default, to root) with syslog.
-    -DSYSLOG_FAILURE	Log failed su's (by default, to root) with syslog.
-@@ -53,6 +63,15 @@
- #include <pwd.h>
- #include <grp.h>
- 
-+#ifdef USE_PAM
-+# include <signal.h>
-+# include <sys/wait.h>
-+# include <sys/fsuid.h>
-+# include <unistd.h>
-+# include <security/pam_appl.h>
-+# include <security/pam_misc.h>
-+#endif /* USE_PAM */
-+
- #include "system.h"
- #include "getpass.h"
- 
-@@ -120,10 +139,17 @@
- /* The user to become if none is specified.  */
- #define DEFAULT_USER "root"
- 
-+#ifndef USE_PAM
- char *crypt (char const *key, char const *salt);
-+#endif
- 
--static void run_shell (char const *, char const *, char **, size_t)
-+static void run_shell (char const *, char const *, char **, size_t,
-+	const struct passwd *)
-+#ifdef USE_PAM
-+	;
-+#else
-      ATTRIBUTE_NORETURN;
-+#endif
- 
- /* If true, pass the `-f' option to the subshell.  */
- static bool fast_startup;
-@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su
- }
- #endif
- 
-+#ifdef USE_PAM
-+static pam_handle_t *pamh = NULL;
-+static int retval;
-+static struct pam_conv conv = {
-+  misc_conv,
-+  NULL
-+};
-+
-+#define PAM_BAIL_P if (retval) { \
-+  pam_end(pamh, PAM_SUCCESS); \
-+  return 0; \
-+}
-+#define PAM_BAIL_P_VOID if (retval) {		\
-+  pam_end(pamh, PAM_SUCCESS);			\
-+return;						\
-+}
-+#endif
-+
- /* Ask the user for a password.
-+   If PAM is in use, let PAM ask for the password if necessary.
-    Return true if the user gives the correct password for entry PW,
-    false if not.  Return true without asking for a password if run by UID 0
-    or if PW has an empty password.  */
-@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su
- static bool
- correct_password (const struct passwd *pw)
- {
-+#ifdef USE_PAM
-+  struct passwd *caller;
-+  char *tty_name, *ttyn;
-+  retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-+  PAM_BAIL_P;
-+
-+  if (getuid() != 0 && !isatty(0)) {
-+	fprintf(stderr, "standard in must be a tty\n");
-+	exit(1);
-+  }
-+
-+  caller = getpwuid(getuid());
-+  if(caller != NULL && caller->pw_name != NULL) {
-+	  retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
-+	  PAM_BAIL_P;
-+  }
-+
-+  ttyn = ttyname(0);
-+  if (ttyn) {
-+    if (strncmp(ttyn, "/dev/", 5) == 0)
-+       tty_name = ttyn+5;
-+    else
-+       tty_name = ttyn;
-+    retval = pam_set_item(pamh, PAM_TTY, tty_name);
-+    PAM_BAIL_P;
-+  }
-+  retval = pam_authenticate(pamh, 0);
-+  PAM_BAIL_P;
-+  retval = pam_acct_mgmt(pamh, 0);
-+  if (retval == PAM_NEW_AUTHTOK_REQD) {
-+    /* password has expired.  Offer option to change it. */
-+    retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-+    PAM_BAIL_P;
-+  }
-+  PAM_BAIL_P;
-+  /* must be authenticated if this point was reached */
-+  return 1;
-+#else /* !USE_PAM */
-   char *unencrypted, *encrypted, *correct;
- #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
-   /* Shadow passwd stuff for SVR3 and maybe other systems.  */
-@@ -241,6 +324,7 @@ correct_password (const struct passwd *p
-   encrypted = crypt (unencrypted, correct);
-   memset (unencrypted, 0, strlen (unencrypted));
-   return STREQ (encrypted, correct);
-+#endif /* !USE_PAM */
- }
- 
- /* Update `environ' for the new shell based on PW, with SHELL being
-@@ -254,12 +338,18 @@ modify_environment (const struct passwd 
-       /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
-          Unset all other environment variables.  */
-       char const *term = getenv ("TERM");
-+      char const *display = getenv ("DISPLAY");
-+      char const *xauthority = getenv ("XAUTHORITY");
-       if (term)
-         term = xstrdup (term);
-       environ = xmalloc ((6 + !!term) * sizeof (char *));
-       environ[0] = NULL;
-       if (term)
-         xsetenv ("TERM", term);
-+      if (display)
-+        xsetenv ("DISPLAY", display);
-+      if (xauthority)
-+        xsetenv ("XAUTHORITY", xauthority);
-       xsetenv ("HOME", pw->pw_dir);
-       xsetenv ("SHELL", shell);
-       xsetenv ("USER", pw->pw_name);
-@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw
- {
- #ifdef HAVE_INITGROUPS
-   errno = 0;
--  if (initgroups (pw->pw_name, pw->pw_gid) == -1)
-+  if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
-+#ifdef USE_PAM
-+    pam_close_session(pamh, 0);
-+    pam_end(pamh, PAM_ABORT);
-+#endif
-     error (EXIT_CANCELED, errno, _("cannot set groups"));
-+  }
-   endgrent ();
- #endif
-   if (setgid (pw->pw_gid))
-@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw
-     error (EXIT_CANCELED, errno, _("cannot set user id"));
- }
- 
-+#ifdef USE_PAM
-+static int caught=0;
-+/* Signal handler for parent process later */
-+static void su_catch_sig(int sig)
-+{
-+  ++caught;
-+}
-+
-+int
-+pam_copyenv (pam_handle_t *pamh)
-+{
-+  char **env;
-+
-+  env = pam_getenvlist(pamh);
-+  if(env) {
-+    while(*env) {
-+	if (putenv (*env))
-+	  xalloc_die ();
-+	env++;
-+    }
-+  }
-+  return(0);
-+}
-+#endif
-+
- /* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
-    If COMMAND is nonzero, pass it to the shell with the -c option.
-    Pass ADDITIONAL_ARGS to the shell as more arguments; there
-@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw
- 
- static void
- run_shell (char const *shell, char const *command, char **additional_args,
--           size_t n_additional_args)
-+           size_t n_additional_args, const struct passwd *pw)
- {
-   size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
-   char const **args = xnmalloc (n_args, sizeof *args);
-   size_t argno = 1;
-+#ifdef USE_PAM
-+  int child;
-+  sigset_t ourset;
-+  int status;
-+
-+  retval = pam_open_session(pamh,0);
-+  if (retval != PAM_SUCCESS) {
-+    fprintf (stderr, "could not open session\n");
-+    exit (1);
-+  }
-+
-+/* do this at the last possible moment, because environment variables may
-+   be passed even in the session phase
-+*/
-+  if(pam_copyenv(pamh) != PAM_SUCCESS)
-+     fprintf (stderr, "error copying PAM environment\n");
-+  
-+  /* Credentials should be set in the parent */ 
-+  if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
-+    pam_close_session(pamh, 0);
-+    fprintf(stderr, "could not set PAM credentials\n");
-+    exit(1);
-+  }
-+
-+  child = fork();
-+  if (child == 0) {  /* child shell */
-+  change_identity (pw);
-+  pam_end(pamh, 0);
-+#endif
- 
-   if (simulate_login)
-     {
-       char *arg0;
-       char *shell_basename;
- 
-+      if(chdir(pw->pw_dir))
-+	      error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+
-       shell_basename = last_component (shell);
-       arg0 = xmalloc (strlen (shell_basename) + 2);
-       arg0[0] = '-';
-@@ -344,6 +496,67 @@ run_shell (char const *shell, char const
-     error (0, errno, "%s", shell);
-     exit (exit_status);
-   }
-+#ifdef USE_PAM
-+  } else if (child == -1) {
-+      fprintf(stderr, "can not fork user shell: %s", strerror(errno));
-+      pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+      pam_close_session(pamh, 0);
-+      pam_end(pamh, PAM_ABORT);
-+      exit(1);
-+  }
-+  /* parent only */
-+  sigfillset(&ourset);
-+  if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
-+    fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
-+    caught = 1;
-+  }
-+  if (!caught) {
-+    struct sigaction action;
-+    action.sa_handler = su_catch_sig;
-+    sigemptyset(&action.sa_mask);
-+    action.sa_flags = 0;
-+    sigemptyset(&ourset);
-+    if (sigaddset(&ourset, SIGTERM)
-+        || sigaddset(&ourset, SIGALRM)
-+        || sigaction(SIGTERM, &action, NULL)
-+        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+      fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+      caught = 1;
-+    }
-+  }
-+  if (!caught) {
-+    do {
-+      int pid;
-+
-+      pid = waitpid(-1, &status, WUNTRACED);
-+
-+      if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) {
-+          kill(getpid(), WSTOPSIG(status));
-+          /* once we get here, we must have resumed */
-+          kill(pid, SIGCONT);
-+      }
-+    } while (0 != WIFSTOPPED(status));
-+  }
-+
-+  if (caught) {
-+    fprintf(stderr, "\nSession terminated, killing shell...");
-+    kill (child, SIGTERM);
-+  }
-+  /* Not checking retval on this because we need to call close session */
-+  pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+  retval = pam_close_session(pamh, 0);
-+  PAM_BAIL_P_VOID;
-+  retval = pam_end(pamh, PAM_SUCCESS);
-+  PAM_BAIL_P_VOID;
-+  if (caught) {
-+    sleep(2);
-+    kill(child, SIGKILL);
-+    fprintf(stderr, " ...killed.\n");
-+    exit(-1);
-+  }
-+  exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status)
-+                                  : WTERMSIG (status) + 128);
-+#endif /* USE_PAM */
- }
- 
- /* Return true if SHELL is a restricted shell (one not returned by
-@@ -511,9 +724,9 @@ main (int argc, char **argv)
-   shell = xstrdup (shell ? shell : pw->pw_shell);
-   modify_environment (pw, shell);
- 
-+#ifndef USE_PAM
-   change_identity (pw);
--  if (simulate_login && chdir (pw->pw_dir) != 0)
--    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+#endif
- 
-   /* error() flushes stderr, but does not check for write failure.
-      Normally, we would catch this via our atexit() hook of
-@@ -523,5 +736,5 @@ main (int argc, char **argv)
-   if (ferror (stderr))
-     exit (EXIT_CANCELED);
- 
--  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
-+  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
- }
diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch
deleted file mode 100644
index b458abeba..000000000
--- a/testing/coreutils/coreutils-uname.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-On linux platforms, grok /proc/cpuinfo for the CPU/vendor info.
-
-Prob not suitable for upstream seeing as how it's 100% linux-specific
-http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html
-
-Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but 
-heavily reworked to suck less.
-
-To add support for additional platforms, check out the show_cpuinfo()
-func in the linux/arch/<ARCH>/ source tree of the kernel.
-
---- coreutils/src/uname.c
-+++ coreutils/src/uname.c
-@@ -50,6 +50,11 @@
- # include <mach-o/arch.h>
- #endif
- 
-+#if defined(__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -138,6 +143,117 @@
-   exit (status);
- }
- 
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+#  define CPUINFO_FILE    "/proc/sysinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+#  define CPUINFO_FILE    "/proc/cpuinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR      0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+	/* first eat trailing space */
-+	char *tmp = buf + strlen(buf) - 1;
-+	while (tmp > buf && isspace(*tmp))
-+		*tmp-- = '\0';
-+	/* then eat leading space */
-+	tmp = buf;
-+	while (*tmp && isspace(*tmp))
-+		tmp++;
-+	if (tmp != buf)
-+		memmove(buf, tmp, strlen(tmp)+1);
-+	/* finally collapse whitespace */
-+	tmp = buf;
-+	while (tmp[0] && tmp[1]) {
-+		if (isspace(tmp[0]) && isspace(tmp[1])) {
-+			memmove(tmp, tmp+1, strlen(tmp));
-+			continue;
-+		}
-+		++tmp;
-+	}
-+}
-+
-+static int __linux_procinfo(int x, char *fstr, size_t s)
-+{
-+	FILE *fp;
-+
-+	char *procinfo_keys[] = {
-+		/* --processor --hardware-platform */
-+		#if defined(__alpha__)
-+			"cpu model", "system type"
-+		#elif defined(__arm__)
-+			"Processor", "Hardware"
-+		#elif defined(__avr32__)
-+			"processor", "cpu family"
-+		#elif defined(__bfin__)
-+			"CPU", "BOARD Name"
-+		#elif defined(__cris__)
-+			"cpu", "cpu model"
-+		#elif defined(__frv__)
-+			"CPU-Core", "System"
-+		#elif defined(__i386__) || defined(__x86_64__)
-+			"model name", "vendor_id"
-+		#elif defined(__ia64__)
-+			"family", "vendor"
-+		#elif defined(__hppa__)
-+			"cpu", "model"
-+		#elif defined(__m68k__)
-+			"CPU", "MMU"
-+		#elif defined(__mips__)
-+			"cpu model", "system type"
-+		#elif defined(__powerpc__) || defined(__powerpc64__)
-+			"cpu", "machine"
-+		#elif defined(__s390__) || defined(__s390x__)
-+			"Type", "Manufacturer"
-+		#elif defined(__sh__)
-+			"cpu type", "machine"
-+		#elif defined(sparc) || defined(__sparc__)
-+			"type", "cpu"
-+		#elif defined(__vax__)
-+			"cpu type", "cpu"
-+		#else
-+			"unknown", "unknown"
-+		#endif
-+	};
-+
-+	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+		char key[65], value[257], eol, *ret = NULL;
-+
-+		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+			__eat_cpuinfo_space(key);
-+			if (!strcmp(key, procinfo_keys[x])) {
-+				__eat_cpuinfo_space(value);
-+				ret = value;
-+				break;
-+			}
-+			if (eol != '\n') {
-+				/* we need two fscanf's here in case the previous
-+				 * length limit caused us to read right up to the
-+				 * newline ... doing "%*[^\n]\n" wont eat the newline
-+				 */
-+				fscanf(fp, "%*[^\n]");
-+				fscanf(fp, "\n");
-+			}
-+		}
-+		fclose(fp);
-+
-+		if (ret) {
-+			strncpy(fstr, ret, s);
-+			return 0;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -250,10 +344,14 @@ main (int argc, char **argv)
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
-         static char processor[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
-         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-           element = processor;
-       }
- #endif
-@@ -306,9 +404,13 @@ main (int argc, char **argv)
-       if (element == unknown)
-         {
-           static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+          if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
-           size_t s = sizeof hardware_platform;
-           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
-           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
-             element = hardware_platform;
-         }
- #endif
diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install
deleted file mode 100644
index 8caae6686..000000000
--- a/testing/coreutils/coreutils.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(coreutils.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam
deleted file mode 100644
index cf15f40f1..000000000
--- a/testing/coreutils/su.pam
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth		sufficient	pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth		required	pam_wheel.so use_uid
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/curl/0001-include-headers-for-tcp-keepalives.patch b/testing/curl/0001-include-headers-for-tcp-keepalives.patch
deleted file mode 100644
index 780fb5b82..000000000
--- a/testing/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/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 43ef820bc..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 147942 2012-01-28 13:31:34Z 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.24.0
-pkgrel=2
-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}
-        0001-include-headers-for-tcp-keepalives.patch
-        curlbuild.h)
-md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
-         '710242df6bc318d16eea611e7d1b1410'
-         '84833972c2ff36abb2bfdd4ac065c2e5'
-         '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"
-
-  patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch"
-
-  ./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/curl/fix-J-with-O-regression.patch b/testing/curl/fix-J-with-O-regression.patch
deleted file mode 100644
index 4b7de1a23..000000000
--- a/testing/curl/fix-J-with-O-regression.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 20 Nov 2011 23:33:46 +0100
-Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
-
-A regression between 7.22.0 and 7.23.0 -- downloading a file with the
-flags -O and -J results in the content being written to stdout if and
-only if there was no Content-Disposition header in the http response. If
-there is a C-D header with a filename attribute, the output is correctly
-written.
-
-Reported by: Dave Reisner
-Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
----
- src/tool_cb_hdr.c      |    3 +-
- src/tool_operate.c     |   59 ++++++++++++++++++++++----------------------
- src/tool_operhlp.c     |   18 +++++++++++++
- tests/data/Makefile.am |    2 +-
- tests/data/test1210    |   63 ++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 112 insertions(+), 33 deletions(-)
- create mode 100644 tests/data/test1210
-
-diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
-index fb24b45..dea7338 100644
---- a/src/tool_cb_hdr.c
-+++ b/src/tool_cb_hdr.c
-@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
-   }
- #endif
- 
--  if(!outs->filename && (cb > 20) &&
--    checkprefix("Content-disposition:", str)) {
-+  if((cb > 20) && checkprefix("Content-disposition:", str)) {
-     const char *p = str + 20;
- 
-     /* look for the 'filename=' parameter
-diff --git a/src/tool_operate.c b/src/tool_operate.c
-index 7ab815f..1e88120 100644
---- a/src/tool_operate.c
-+++ b/src/tool_operate.c
-@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
- 
-           if((urlnode->flags & GETOUT_USEREMOTE)
-              && config->content_disposition) {
--            /* Our header callback sets the filename */
-+            /* Our header callback MIGHT set the filename */
-             DEBUGASSERT(!outs.filename);
-           }
--          else {
--            if(config->resume_from_current) {
--              /* We're told to continue from where we are now. Get the size
--                 of the file as it is now and open it for append instead */
--              struct_stat fileinfo;
--              /* VMS -- Danger, the filesize is only valid for stream files */
--              if(0 == stat(outfile, &fileinfo))
--                /* set offset to current file size: */
--                config->resume_from = fileinfo.st_size;
--              else
--                /* let offset be 0 */
--                config->resume_from = 0;
--            }
- 
--            if(config->resume_from) {
--              /* open file for output: */
--              FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
--              if(!file) {
--                helpf(config->errors, "Can't open '%s'!\n", outfile);
--                res = CURLE_WRITE_ERROR;
--                goto quit_urls;
--              }
--              outs.fopened = TRUE;
--              outs.stream = file;
--              outs.init = config->resume_from;
--            }
--            else {
--              outs.stream = NULL; /* open when needed */
-+          if(config->resume_from_current) {
-+            /* We're told to continue from where we are now. Get the size
-+               of the file as it is now and open it for append instead */
-+            struct_stat fileinfo;
-+            /* VMS -- Danger, the filesize is only valid for stream files */
-+            if(0 == stat(outfile, &fileinfo))
-+              /* set offset to current file size: */
-+              config->resume_from = fileinfo.st_size;
-+            else
-+              /* let offset be 0 */
-+              config->resume_from = 0;
-+          }
-+
-+          if(config->resume_from) {
-+            /* open file for output: */
-+            FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
-+            if(!file) {
-+              helpf(config->errors, "Can't open '%s'!\n", outfile);
-+              res = CURLE_WRITE_ERROR;
-+              goto quit_urls;
-             }
--            outs.filename = outfile;
--            outs.s_isreg = TRUE;
-+            outs.fopened = TRUE;
-+            outs.stream = file;
-+            outs.init = config->resume_from;
-+          }
-+          else {
-+            outs.stream = NULL; /* open when needed */
-           }
-+          outs.filename = outfile;
-+          outs.s_isreg = TRUE;
-         }
- 
-         if(uploadfile && !stdin_upload(uploadfile)) {
-diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
-index 808d2d5..4c1697b 100644
---- a/src/tool_operhlp.c
-+++ b/src/tool_operhlp.c
-@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url)
-         return CURLE_OUT_OF_MEMORY;
-     }
-   }
-+
-+  /* in case we built debug enabled, we allow an environment variable
-+   * named CURL_TESTDIR to prefix the given file name to put it into a
-+   * specific directory
-+   */
-+#ifdef DEBUGBUILD
-+  {
-+    char *tdir = curlx_getenv("CURL_TESTDIR");
-+    if(tdir) {
-+      char buffer[512]; /* suitably large */
-+      snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename);
-+      Curl_safefree(*filename);
-+      *filename = strdup(buffer); /* clone the buffer */
-+      curl_free(tdir);
-+    }
-+  }
-+#endif
-+
-   return CURLE_OK;
- }
- 
--- 
-1.7.7.3
diff --git a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch
deleted file mode 100644
index 694f4bb67..000000000
--- a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
-
-Use the correct path for the saslauthd.conf file, and use another
-date format (cosmetic).
-
-diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
---- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
-@@ -10,7 +10,7 @@
- .\" manpage in saslauthd.8 whenever you change this source
- .\" version. Only the pre-formatted manpage is installed.
- .\"
--.Dd 10 24 2002
-+.Dd October 24 2002
- .Dt SASLAUTHD 8
- .Os "CMU-SASL"
- .Sh NAME
-@@ -216,7 +216,7 @@
- .Em (All platforms that support OpenLDAP 2.0 or higher)
- .Pp
- Authenticate against an ldap server.  The ldap configuration parameters are
--read from /usr/local/etc/saslauthd.conf.  The location of this file can be
-+read from /etc/saslauthd.conf.  The location of this file can be
- changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
- distribution for the list of available parameters.
- .It Li sia
-@@ -249,7 +249,7 @@
- .Bl -tag -width "/var/run/saslauthd/mux"
- .It Pa /var/run/saslauthd/mux
- The default communications socket.
--.It Pa /usr/local/etc/saslauthd.conf
-+.It Pa /etc/saslauthd.conf
- The default configuration file for ldap support.
- .El
- .Sh SEE ALSO
diff --git a/testing/cyrus-sasl/0010_maintainer_mode.patch b/testing/cyrus-sasl/0010_maintainer_mode.patch
deleted file mode 100644
index cf3d02a08..000000000
--- a/testing/cyrus-sasl/0010_maintainer_mode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable maintainer mode to avoid auto* problems.
-
-@DPATCH@
-diff -urNad trunk~/configure.in trunk/configure.in
---- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
-+++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
-@@ -62,6 +62,8 @@
- AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
- CMU_INIT_AUTOMAKE
- 
-+AM_MAINTAINER_MODE
-+
- # and include our config dir scripts
- ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
- 
diff --git a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch
deleted file mode 100644
index 3805b4857..000000000
--- a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
-
-Enable libtool use.
-
-diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
---- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
-@@ -25,6 +25,7 @@
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch
deleted file mode 100644
index d50ec8343..000000000
--- a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
-
-When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
-will define a correct function prototype for the crypt function.
-This avoids segfaults on architectures where the size of a pointer
-is greater than the size of an integer (ia64 and amd64 are examples).
-This may be detected by looking for build log lines such as the
-following:
-auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
-auth_shadow.c:183: warning: cast to pointer from integer of different
-size
-
-diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
---- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
-@@ -1,3 +1,4 @@
-+#define _XOPEN_SOURCE
- #define PWBUFSZ 256 /***SWB***/
- 
- /* MODULE: auth_shadow */
diff --git a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch
deleted file mode 100644
index e9170cef3..000000000
--- a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
-
-pid_file_lock is created with a mask of 644 instead of 0644.
-This patch fixes this octal/decimal confusion as well as the
-(harmless) one in the previous umask() call.
-
-diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
---- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
-@@ -276,7 +276,7 @@
- 		exit(1);
- 	}
- 
--	umask(077);
-+	umask(0077);
- 
- 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
- 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
-@@ -287,7 +287,7 @@
- 	strlcpy(pid_file_lock, run_path, pid_file_size);
- 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
- 
--	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
-+	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
- 		rc = errno;
- 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
- 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch
deleted file mode 100644
index 13fa999f0..000000000
--- a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
-
-All lines beginning with `## DP:' are a description of the patch.
-Avoid infinite loop when username/password has a double quote character.
-Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
-
-diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
---- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
-+++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
-@@ -162,6 +162,7 @@
-     num_quotes = 0;
-     p1 = s;
-     while ((p1 = strchr(p1, '"')) != NULL) {
-+	p1++;
- 	num_quotes++;
-     }
-     
-@@ -438,7 +439,7 @@
- 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
- 	memset(qlogin, 0, strlen(qlogin));
- 	free(qlogin);
--	memset(qpass, 0, strlen(qlogin));
-+	memset(qpass, 0, strlen(qpass));
- 	free(qpass);
- 	(void)close(s);
- 	return strdup(RESP_IERROR);
-@@ -447,7 +448,7 @@
-     /* don't need these any longer */
-     memset(qlogin, 0, strlen(qlogin));
-     free(qlogin);
--    memset(qpass, 0, strlen(qlogin));
-+    memset(qpass, 0, strlen(qpass));
-     free(qpass);
- 
-     /* read and parse the LOGIN response */
diff --git a/testing/cyrus-sasl/0019_ldap_deprecated.patch b/testing/cyrus-sasl/0019_ldap_deprecated.patch
deleted file mode 100644
index 8825256cb..000000000
--- a/testing/cyrus-sasl/0019_ldap_deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
-
-The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
-Therefore, its prototype is not included by default when compiling
-against the ldap.h headers. As a result, the compiler cannot know the
-return type of the function at compile time, and will implicitly
-convert to a pointer. This has implications on 64-bit systems.
-This patch sets the deprecation mode on, so that the function prototype
-gets included when compiling.
-(Description by Fabian Fagerholm <fabbe@debian.org>)
-
-diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
---- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
-+++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
-@@ -55,6 +55,7 @@
- #include <openssl/des.h>
- #endif
- 
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #include <lber.h>
- #include <sasl.h>
diff --git a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch
deleted file mode 100644
index a49b553f0..000000000
--- a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
-
-The #elif preprocessor directive requires a test condition.
-GCC 4.4 enforces this rule.
-
-diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
---- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
-+++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
-@@ -2715,7 +2715,7 @@
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4034,7 +4034,7 @@
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,
diff --git a/testing/cyrus-sasl/0025_ld_as_needed.patch b/testing/cyrus-sasl/0025_ld_as_needed.patch
deleted file mode 100644
index 67b48b4a4..000000000
--- a/testing/cyrus-sasl/0025_ld_as_needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- 
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
diff --git a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch
deleted file mode 100644
index cc00867ef..000000000
--- a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Roberto C. Sanchez <roberto@connexer.com>
-Description: Drop gratuitous dependency on krb5support
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
-   fi
- 
-   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
--    # check for libkrb5support first
--    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
--
-     gss_failed=0
-     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch
deleted file mode 100644
index 522824074..000000000
--- a/testing/cyrus-sasl/0027_db5_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ondřej Surý <ondrej@debian.org>
-Description: Support newer Berkeley DB versions
---- a/sasldb/db_berkeley.c
-+++ b/sasldb/db_berkeley.c
-@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
---- a/utils/dbconverter-2.c
-+++ b/utils/dbconverter-2.c
-@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch
deleted file mode 100644
index 14a322496..000000000
--- a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/lib/dlopen.c
-+++ b/lib/dlopen.c
-@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
-     return result;
- }
- 
--/* this returns the file to actually open.
-- *  out should be a buffer of size PATH_MAX
-- *  and may be the same as in. */
--
--/* We'll use a static buffer for speed unless someone complains */
--#define MAX_LINE 2048
--
--static int _parse_la(const char *prefix, const char *in, char *out) 
--{
--    FILE *file;
--    size_t length;
--    char line[MAX_LINE];
--    char *ntmp = NULL;
--
--    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
--
--    /* Set this so we can detect failure */
--    *out = '\0';
--
--    length = strlen(in);
--
--    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
--	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
--	    /* check for a .la file */
--	    strcpy(line, prefix);
--	    strcat(line, in);
--	    length = strlen(line);
--	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
--	    strcat(line, LA_SUFFIX);
--	    file = fopen(line, "r");
--	    if(file) {
--		/* We'll get it on the .la open */
--		fclose(file);
--		return SASL_FAIL;
--	    }
--	}
--	strcpy(out, prefix);
--	strcat(out, in);
--	return SASL_OK;
--    }
--
--    strcpy(line, prefix);
--    strcat(line, in);
--
--    file = fopen(line, "r");
--    if(!file) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "unable to open LA file: %s", line);
--	return SASL_FAIL;
--    }
--    
--    while(!feof(file)) {
--	if(!fgets(line, MAX_LINE, file)) break;
--	if(line[strlen(line) - 1] != '\n') {
--	    _sasl_log(NULL, SASL_LOG_WARN,
--		      "LA file has too long of a line: %s", in);
--	    return SASL_BUFOVER;
--	}
--	if(line[0] == '\n' || line[0] == '#') continue;
--	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
--	    /* We found the line with the name in it */
--	    char *end;
--	    char *start;
--	    size_t len;
--	    end = strrchr(line, '\'');
--	    if(!end) continue;
--	    start = &line[sizeof("dlname=")-1];
--	    len = strlen(start);
--	    if(len > 3 && start[0] == '\'') {
--		ntmp=&start[1];
--		*end='\0';
--		/* Do we have dlname="" ? */
--		if(ntmp == end) {
--		    _sasl_log(NULL, SASL_LOG_DEBUG,
--			      "dlname is empty in .la file: %s", in);
--		    return SASL_FAIL;
--		}
--		strcpy(out, prefix);
--		strcat(out, ntmp);
--	    }
--	    break;
--	}
--    }
--    if(ferror(file) || feof(file)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Error reading .la: %s\n", in);
--	fclose(file);
--	return SASL_FAIL;
--    }
--    fclose(file);
--
--    if(!(*out)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Could not find a dlname line in .la file: %s", in);
--	return SASL_FAIL;
--    }
--
--    return SASL_OK;
--}
- #endif /* DO_DLOPEN */
- 
- /* loads a plugin library */
-@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
- 		if (length + pos>=PATH_MAX) continue; /* too big */
- 
- 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
--			   SO_SUFFIX)
--		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
--			   LA_SUFFIX))
-+			   SO_SUFFIX))
- 		    continue;
- 
-+		/* We only use .so files for loading plugins */
-+
- 		memcpy(name,dir->d_name,length);
- 		name[length]='\0';
- 
--		result = _parse_la(prefix, name, tmp);
--		if(result != SASL_OK)
--		    continue;
--		
-+		/* Create full name with path */
-+		strncpy(tmp, prefix, PATH_MAX);
-+		strncat(tmp, name, PATH_MAX);
-+
- 		/* skip "lib" and cut off suffix --
- 		   this only need be approximate */
- 		strcpy(plugname, name + 3);
diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD
deleted file mode 100644
index df3a340fa..000000000
--- a/testing/cyrus-sasl/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# $Id: PKGBUILD 146329 2012-01-09 18:52:13Z stephane $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-# This package spans multiple repositories. 
-# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
-
-pkgbase=('cyrus-sasl')
-pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
-#pkgname=libsasl
-pkgver=2.1.23
-pkgrel=9
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/"
-license=('custom')
-options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-        cyrus-sasl-2.1.19-checkpw.c.patch
-        cyrus-sasl-2.1.22-crypt.patch
-        cyrus-sasl-2.1.22-qa.patch
-        cyrus-sasl-2.1.22-automake-1.10.patch
-        cyrus-sasl-2.1.23-authd-fix.patch
-        0003_saslauthd_mdoc.patch
-        0010_maintainer_mode.patch
-        0011_saslauthd_ac_prog_libtool.patch
-        0012_xopen_crypt_prototype.patch
-        0016_pid_file_lock_creation_mask.patch
-        0018_auth_rimap_quotes.patch
-        0019_ldap_deprecated.patch
-        0022_gcc4.4_preprocessor_syntax.patch
-        0025_ld_as_needed.patch
-        0026_drop_krb5support_dependency.patch
-        0027_db5_support.patch
-        0030-dont_use_la_files_for_opening_plugins.patch
-        saslauthd.conf.d
-        saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
-         '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
-         'f45d8b60e8f74dd7f7c2ec1665fa602a'
-         '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
-         '62bf892fe4d1df41ff748e91a1afaf67'
-         'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
-         '8e7106f32e495e9ade69014fd1b3352a'
-         '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20')
-
-build() {
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
-  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
-  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
-  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
-  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
-  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
-  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I cmulocal
-  automake -a -c
-  autoheader
-  autoconf
-
-  pushd saslauthd
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I ../cmulocal -I ../config
-  automake -a -c
-  autoheader
-  autoconf
-  popd
-
-  ./configure --prefix=/usr \
-      --mandir=/usr/share/man \
-      --infodir=/usr/share/info \
-      --disable-static \
-      --enable-shared \
-      --enable-alwaystrue \
-      --enable-checkapop \
-      --enable-cram \
-      --enable-digest \
-      --disable-otp \
-      --disable-srp \
-      --disable-srp-setpass \
-      --disable-krb4 \
-      --enable-gssapi \
-      --enable-auth-sasldb \
-      --enable-plain \
-      --enable-anon \
-      --enable-login \
-      --enable-ntlm \
-      --disable-passdss \
-      --enable-sql \
-      --enable-ldapdb \
-      --disable-macos-framework \
-      --with-pam \
-      --with-saslauthd=/var/run/saslauthd \
-      --with-ldap \
-      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-      --sysconfdir=/etc \
-      --with-devrandom=/dev/urandom
-  make
-}
-
-package_libsasl() {
-  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl')
-  conflicts=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  for dir in include lib sasldb plugins utils; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
-  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
-}
-
-package_cyrus-sasl() {
-  depends=("libsasl=${pkgver}-${pkgrel}")
-  pkgdesc="Cyrus saslauthd SASL authentication daemon"
-  backup=('etc/conf.d/saslauthd')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/etc/conf.d"
-  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
-}
-
-package_cyrus-sasl-gssapi() {
-  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
-}
-
-package_cyrus-sasl-ldap() {
-  pkgdesc="ldapdb auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
-}
-
-package_cyrus-sasl-sql() {
-  pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
-}
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
deleted file mode 100644
index f7bf44b79..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
-+++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
-@@ -120,7 +120,7 @@
- JAVA_TRUE = @JAVA_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = -lcrypt @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
-+++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
-@@ -94,6 +94,23 @@
- # endif
- #endif
- 
-+/******************************
-+ * crypt(3) patch start       *
-+ ******************************/
-+char *crypt(const char *key, const char *salt);
-+
-+/* cleartext password formats */
-+#define PASSWORD_FORMAT_CLEARTEXT 1
-+#define PASSWORD_FORMAT_CRYPT 2
-+#define PASSWORD_FORMAT_CRYPTTRAD 3
-+#define PASSWORD_SALT_BUF_LEN 22
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format);
-+
-+/******************************
-+ * crypt(3) patch stop        *
-+ ******************************/
- 
- /* we store the following secret to check plaintext passwords:
-  *
-@@ -143,7 +160,51 @@
- 				       "*cmusaslsecretPLAIN",
- 				       NULL };
-     struct propval auxprop_values[3];
--    
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 * for password format check  *
-+	 ******************************/
-+    sasl_getopt_t *getopt;
-+    void *context;
-+    const char *p = NULL;
-+	/**
-+	 * MD5: 12 char salt
-+	 * BLOWFISH: 16 char salt
-+	 */
-+	char salt[PASSWORD_SALT_BUF_LEN];
-+	int password_format;
-+
-+	/* get password format from auxprop configuration */
-+	if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
-+		getopt(context, NULL, "password_format", &p, NULL);
-+	}
-+
-+	/* set password format */
-+	if (p) {
-+		/*
-+		memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
-+		strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
-+		*/
-+		/* modern, modular crypt(3) */
-+		if (strncmp(p, "crypt", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPT;
-+		/* traditional crypt(3) */
-+		else if (strncmp(p, "crypt_trad", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPTTRAD;
-+		/* cleartext password */
-+		else
-+			password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	} else {
-+		/* cleartext password */
-+		password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	}
-+
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 * for password format check  *
-+	 ******************************/
-+
-     if (!conn || !userstr)
- 	return SASL_BADPARAM;
- 
-@@ -180,14 +241,31 @@
- 	goto done;
-     }
- 
--    /* At the point this has been called, the username has been canonified
--     * and we've done the auxprop lookup.  This should be easy. */
--    if(auxprop_values[0].name
--       && auxprop_values[0].values
--       && auxprop_values[0].values[0]
--       && !strcmp(auxprop_values[0].values[0], passwd)) {
--	/* We have a plaintext version and it matched! */
--	return SASL_OK;
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 ******************************/	
-+
-+	/* get salt */
-+	_sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
-+	
-+	/* crypt(3)-ed password? */
-+	if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare password */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	}
-+	else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare passwords */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 ******************************/
-     } else if(auxprop_values[1].name
- 	      && auxprop_values[1].values
- 	      && auxprop_values[1].values[0]) {
-@@ -975,3 +1053,37 @@
- #endif     
-     { NULL, NULL }
- };
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format) {
-+	int num;	/* how many characters is salt long? */
-+	switch (format) {
-+		case PASSWORD_FORMAT_CRYPT:
-+			/* md5 crypt */
-+			if (src[1] == '1')
-+				num = 12;
-+			/* blowfish crypt */
-+			else if (src[1] == '2')
-+				num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
-+			/* traditional crypt */
-+			else
-+				num = 2;
-+			break;
-+	
-+		case PASSWORD_FORMAT_CRYPTTRAD:
-+			num = 2;
-+			break;
-+
-+		default:
-+			return 1;
-+	}
-+
-+	/* destroy destination */
-+	memset(dest, '\0', (num + 1));
-+
-+	/* copy salt to destination */
-+	strncpy(dest, src, num);
-+
-+	return 1;
-+}
-+
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch
deleted file mode 100644
index 1294cb507..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
-+++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
-@@ -77,7 +77,7 @@
-   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
-   SASL_DB_PATH_CHECK()
-   SASL_DB_CHECK()
--  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
- fi
- 
- AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch
deleted file mode 100644
index 8cd71c0c5..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
-originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
-using automake 1.10.
-
---- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
-@@ -82,73 +82,73 @@
- 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
- 
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
--libplain_la_LDFLAGS = -version-info $(plain_version)
-+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
- libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
--libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
-+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
- libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
- libanonymous_la_LIBADD = $(COMPAT_OBJS)
- 
- libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
--libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
-+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
- libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
- libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
--libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
-+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
- libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
- libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
--libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
-+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
- libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libcrammd5_la_LIBADD = $(COMPAT_OBJS)
- 
- libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
--libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
-+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
- libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- liblogin_la_SOURCES = login.c login_init.c $(common_sources)
--liblogin_la_LDFLAGS = -version-info $(login_version)
-+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
- liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
- liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
--libsrp_la_LDFLAGS = -version-info $(srp_version)
-+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
- libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
- 
- libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
--libotp_la_LDFLAGS = -version-info $(otp_version)
-+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
- libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
- 
- libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
--libntlm_la_LDFLAGS = -version-info $(ntlm_version)
-+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
- libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
- libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
- 
- libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
--libpassdss_la_LDFLAGS = -version-info $(passdss_version)
-+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
- libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
- libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
- 
- # Auxprop Plugins
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
--libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
-+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
- 
- libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
--libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
-+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
- libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
- 
- libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
-+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
- libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsql_la_LIBADD = $(COMPAT_OBJS)
- 
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch
deleted file mode 100644
index fd356327b..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://bugs.gentoo.org/152544
-
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -45,6 +45,7 @@ sasl_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
- noinst_LIBRARIES = @SASL_STATIC_LIBS@
---- cyrus-sasl-2.1.22/plugins/Makefile.am
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am
-@@ -63,6 +63,7 @@ srp_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
-+AM_CFLAGS = -fPIC
- 
- COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
- 
---- cyrus-sasl-2.1.22/sasldb/Makefile.am
-+++ cyrus-sasl-2.1.22/sasldb/Makefile.am
-@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
- 
- extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = NTMakefile
- 
- noinst_LTLIBRARIES = libsasldb.la
---- cyrus-sasl-2.1.22/utils/Makefile.am
-+++ cyrus-sasl-2.1.22/utils/Makefile.am
-@@ -42,7 +42,7 @@
- #
- ################################################################
- 
--all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
-+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
- all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
- 
- sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
---- cyrus-sasl-2.1.22/sample/Makefile.am
-+++ cyrus-sasl-2.1.22/sample/Makefile.am
-@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
- server_SOURCES = server.c common.c common.h
- client_SOURCES = client.c common.c common.h
- 
--server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
--sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
- EXTRA_DIST = NTMakefile
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
- libsasl2_la_SOURCES = $(common_sources) $(common_headers)
- libsasl2_la_LDFLAGS = -version-info $(sasl_version)
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
--libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
-+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch
deleted file mode 100644
index 4f7b04f13..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix missing prototype warnings
-
---- cyrus-sasl-2.1.22/lib/auxprop.c
-+++ cyrus-sasl-2.1.22/lib/auxprop.c
-@@ -43,6 +43,7 @@
-  */
- 
- #include <config.h>
-+#include <stdio.h>
- #include <sasl.h>
- #include <prop.h>
- #include <ctype.h>
---- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
- ******************************************************************/
- 
- #include <shadow.h>
-+#include <string.h>
- 
- extern char *crypt();
- 
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch
deleted file mode 100644
index f5f372d17..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-fix warnings:
-
-auth_sasldb.c: In function ‘auth_sasldb’:
-auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
-
-auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
-../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
-
---- saslauthd/auth_sasldb.c
-+++ saslauthd/auth_sasldb.c
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <pwd.h>
-+#include <unistd.h>
- /* END PUBLIC DEPENDENCIES */
- 
- #define RETURN(x) return strdup(x)
-@@ -131,7 +132,8 @@
-     /* VARIABLES */
-     char pw[1024];			/* pointer to passwd file entry */
-     sasl_utils_t utils;
--    int ret, outsize;
-+    int ret;
-+    size_t outsize;
-     const char *use_realm;
-     char realm_buf[MAXHOSTNAMELEN];
-     /* END VARIABLES */
diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/testing/cyrus-sasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
-    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
-      add_daemon $DAEMON_NAME
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon $DAEMON_NAME
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/cyrus-sasl/saslauthd.conf.d b/testing/cyrus-sasl/saslauthd.conf.d
deleted file mode 100644
index 167211290..000000000
--- a/testing/cyrus-sasl/saslauthd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SASLAUTHD_OPTS="-a pam"
diff --git a/testing/db/PKGBUILD b/testing/db/PKGBUILD
deleted file mode 100644
index 00bb4163e..000000000
--- a/testing/db/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146331 2012-01-09 18:52:15Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=db
-pkgver=5.3.15
-pkgrel=1
-pkgdesc="The Berkeley DB embedded database system"
-arch=('i686' 'x86_64')
-url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-license=('custom')
-depends=('gcc-libs' 'sh')
-options=('!libtool')
-install=db.install
-source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('7683b632a01ff3543c379a120809a942ec457738')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --enable-static --enable-cxx --enable-dbm
-  make LIBSO_LIBS=-lpthread
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/docs
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/db/db.install b/testing/db/db.install
deleted file mode 100644
index 03b64042d..000000000
--- a/testing/db/db.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 5.1)" -lt 0 ]; then
-    echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
-  fi
-}
diff --git a/testing/e2fsprogs/MIT-LICENSE b/testing/e2fsprogs/MIT-LICENSE
deleted file mode 100644
index d849b28f2..000000000
--- a/testing/e2fsprogs/MIT-LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2003-2007 Theodore Ts'o <tytso@mit.edu>
-Copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
-Copyright (c) 2001 Alcove <http://www.alcove.com/>
-Copyright (c) 1997 Klee Dienes
-Copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD
deleted file mode 100644
index 1f1973390..000000000
--- a/testing/e2fsprogs/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 146651 2012-01-15 11:45:33Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=e2fsprogs
-pkgver=1.42
-pkgrel=1
-pkgdesc="Ext2/3/4 filesystem utilities"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'MIT')
-url="http://e2fsprogs.sourceforge.net"
-groups=('base')
-depends=('sh' 'util-linux-ng')
-makedepends=('bc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'MIT-LICENSE')
-backup=('etc/mke2fs.conf')
-install=${pkgname}.install
-sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6'
-          'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Remove unnecessary init.d directory
-  sed -i '/init\.d/s|^|#|' misc/Makefile.in
-
-  ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \
-      --disable-fsck --disable-uuidd \
-      --disable-libuuid --disable-libblkid
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-libs
-
-  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
-  
-  # remove references to build directory
-  sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
-  sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
-
-  # install MIT license
-  install -Dm644 "${srcdir}/MIT-LICENSE" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
-}
diff --git a/testing/e2fsprogs/e2fsprogs.install b/testing/e2fsprogs/e2fsprogs.install
deleted file mode 100644
index 1a7fe20d7..000000000
--- a/testing/e2fsprogs/e2fsprogs.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libext2fs.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/e2fsprogs/mke2fs.conf b/testing/e2fsprogs/mke2fs.conf
deleted file mode 100644
index 92464e3b4..000000000
--- a/testing/e2fsprogs/mke2fs.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-[defaults]
-	base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
-	blocksize = 4096
-	inode_size = 128
-	inode_ratio = 16384
-
-[fs_types]
-	small = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 4096
-	}
-	floppy = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 8192
-	}
-	news = {
-		inode_ratio = 4096
-	}
-	largefile = {
-		inode_ratio = 1048576
-	}
-	largefile4 = {
-		inode_ratio = 4194304
-	}
diff --git a/testing/ed/PKGBUILD b/testing/ed/PKGBUILD
deleted file mode 100644
index f6216b752..000000000
--- a/testing/ed/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 145806 2012-01-01 23:26:54Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=ed
-pkgver=1.6
-pkgrel=1
-pkgdesc="A POSIX-compliant line-oriented text editor"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/ed/ed.html"
-depends=('glibc' 'sh')
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9a78593decccaa889523aa4bb555ed4b')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/ \
-              --mandir=/usr/share/man \
-              --infodir=/usr/share/info \
-              "CFLAGS=$CFLAGS" \
-              "LDFLAGS=$LDFLAGS"
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install
-
-  # nuke info pages
-  rm -r "$pkgdir/usr/share/info"
-}
diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD
deleted file mode 100644
index e52a2256c..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146380 2012-01-09 22:12:06Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.2.3
-pkgrel=2
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD
deleted file mode 100644
index 8f40cf117..000000000
--- a/testing/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 146335 2012-01-09 18:52:23Z stephane $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.2.1
-pkgrel=2
-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=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/testing/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/evolution-groupwise/PKGBUILD b/testing/evolution-groupwise/PKGBUILD
deleted file mode 100644
index a1e46d646..000000000
--- a/testing/evolution-groupwise/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146337 2012-01-09 18:52:25Z stephane $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=evolution-groupwise
-pkgver=3.2.1
-pkgrel=2
-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/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/testing/freeglut/PKGBUILD b/testing/freeglut/PKGBUILD
deleted file mode 100644
index b817a6a43..000000000
--- a/testing/freeglut/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147022 2012-01-20 20:50:51Z heftig $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=freeglut
-pkgver=2.8.0
-pkgrel=1
-pkgdesc="Provides functionality for small OpenGL programs"
-arch=('i686' 'x86_64')
-url="http://freeglut.sourceforge.net/"
-license=('MIT')
-depends=('libxxf86vm' 'mesa' 'libxi')
-replaces=('glut')
-provides=('glut')
-conflicts=('glut')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5db8651af306bc403fbfd36934a20e1d')
-sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/gimp/gimp-poppler-0.18.patch b/testing/gimp/gimp-poppler-0.18.patch
deleted file mode 100644
index 0715460bc..000000000
--- a/testing/gimp/gimp-poppler-0.18.patch
+++ /dev/null
@@ -1,476 +0,0 @@
-From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Fri, 6 May 2011 11:58:44 +0200
-Subject: [PATCH] patch: poppler-0.17
-
-Squashed commit of the following:
-
-commit 529d940222dfc352d41fbf72de29134421aa4002
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Fri May 6 11:50:30 2011 +0200
-
-    use code based on pixbufs instead of cairo surfaces
-
-    this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for
-    hints how to do this
-
-commit f8671d8767d4cdab830dc06310e96c63a88ec0fd
-Author: Mukund Sivaraman <muks@banu.com>
-Date:   Thu Apr 21 13:57:13 2011 +0530
-
-    file-pdf-load: Update attribution, removing bogus copyright
-    (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019)
-
-commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:52:18 2011 +0200
-
-    file-pdf-load: Use better API + cleanups
-
-    * fixes issues with poppler 0.17 completely
-    * uses new libgimp API to pass surfaces instead of pixbufs
-    * uses GTK+ 3 API to convert surfaces to pixbufs where available
-    (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2)
-
-commit 4e92302c4a14a961f112587a0ad86696c88da2f8
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:38:08 2011 +0200
-
-    file-pdf-load: Don't use deprecated API (bug #646947)
-
-    (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237)
-
-    Conflicts:
-
-    	plug-ins/common/file-pdf.c
----
- plug-ins/common/file-pdf.c |  323 ++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 283 insertions(+), 40 deletions(-)
-
-diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c
-index a43b459..43c2b7d 100644
---- a/plug-ins/common/file-pdf.c
-+++ b/plug-ins/common/file-pdf.c
-@@ -4,6 +4,9 @@
-  *
-  * Copyright (C) 2005 Nathan Summers
-  *
-+ * Some code in render_page_to_surface() borrowed from
-+ * poppler.git/glib/poppler-page.cc.
-+ *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-@@ -80,16 +83,20 @@ static gboolean          load_dialog       (PopplerDocument        *doc,
- static PopplerDocument * open_document     (const gchar            *filename,
-                                             GError                **error);
- 
--static GdkPixbuf *       get_thumbnail     (PopplerDocument        *doc,
-+static cairo_surface_t * get_thumb_surface (PopplerDocument        *doc,
-+                                            gint                    page,
-+                                            gint                    preferred_size);
-+
-+static GdkPixbuf *       get_thumb_pixbuf  (PopplerDocument        *doc,
-                                             gint                    page,
-                                             gint                    preferred_size);
- 
- static gint32            layer_from_pixbuf (gint32                  image,
--                                            const gchar            *layer_name,
--                                            gint                    position,
--                                            GdkPixbuf              *buf,
--                                            gdouble                 progress_start,
--                                            gdouble                 progress_scale);
-+					                        const gchar            *layer_name,
-+					                        gint                    position,
-+					                        GdkPixbuf              *pixbuf,
-+					                        gdouble                 progress_start,
-+					                        gdouble                 progress_scale);
- 
- /**
-  ** the following was formerly part of
-@@ -433,11 +440,12 @@ run (const gchar      *name,
-         }
-       else
-         {
--          gdouble      width  = 0;
--          gdouble      height = 0;
--          gdouble      scale;
--          gint32       image  = -1;
--          GdkPixbuf   *pixbuf = NULL;
-+          gdouble    width     = 0;
-+          gdouble    height    = 0;
-+          gdouble    scale;
-+          gint32     image     = -1;
-+          gint       num_pages = 0;
-+          GdkPixbuf *pixbuf    = NULL;
- 
-           /* Possibly retrieve last settings */
-           gimp_get_data (LOAD_PROC, &loadvals);
-@@ -455,7 +463,10 @@ run (const gchar      *name,
-                   g_object_unref (page);
-                 }
- 
--              pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32);
-+              num_pages = poppler_document_get_n_pages (doc);
-+
-+              pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32);
-+
-               g_object_unref (doc);
-             }
- 
-@@ -548,6 +559,187 @@ open_document (const gchar  *filename,
-   return doc;
- }
- 
-+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */
-+
-+#if (!GTK_CHECK_VERSION (3, 0, 0))
-+
-+static cairo_format_t
-+gdk_cairo_format_for_content (cairo_content_t content)
-+{
-+  switch (content)
-+    {
-+    case CAIRO_CONTENT_COLOR:
-+      return CAIRO_FORMAT_RGB24;
-+    case CAIRO_CONTENT_ALPHA:
-+      return CAIRO_FORMAT_A8;
-+    case CAIRO_CONTENT_COLOR_ALPHA:
-+    default:
-+      return CAIRO_FORMAT_ARGB32;
-+    }
-+}
-+
-+static cairo_surface_t *
-+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
-+                                   cairo_content_t  content,
-+                                   int              src_x,
-+                                   int              src_y,
-+                                   int              width,
-+                                   int              height)
-+{
-+  cairo_surface_t *copy;
-+  cairo_t *cr;
-+
-+  copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
-+                                     width,
-+                                     height);
-+
-+  cr = cairo_create (copy);
-+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+  cairo_set_source_surface (cr, surface, -src_x, -src_y);
-+  cairo_paint (cr);
-+  cairo_destroy (cr);
-+
-+  return copy;
-+}
-+
-+static void
-+convert_alpha (guchar *dest_data,
-+               int     dest_stride,
-+               guchar *src_data,
-+               int     src_stride,
-+               int     src_x,
-+               int     src_y,
-+               int     width,
-+               int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      guint alpha = src[x] >> 24;
-+
-+      if (alpha == 0)
-+        {
-+          dest_data[x * 4 + 0] = 0;
-+          dest_data[x * 4 + 1] = 0;
-+          dest_data[x * 4 + 2] = 0;
-+        }
-+      else
-+        {
-+          dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
-+        }
-+      dest_data[x * 4 + 3] = alpha;
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+static void
-+convert_no_alpha (guchar *dest_data,
-+                  int     dest_stride,
-+                  guchar *src_data,
-+                  int     src_stride,
-+                  int     src_x,
-+                  int     src_y,
-+                  int     width,
-+                  int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      dest_data[x * 3 + 0] = src[x] >> 16;
-+      dest_data[x * 3 + 1] = src[x] >>  8;
-+      dest_data[x * 3 + 2] = src[x];
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+/**
-+ * gdk_pixbuf_get_from_surface:
-+ * @surface: surface to copy from
-+ * @src_x: Source X coordinate within @surface
-+ * @src_y: Source Y coordinate within @surface
-+ * @width: Width in pixels of region to get
-+ * @height: Height in pixels of region to get
-+ *
-+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
-+ * representation inside a #GdkPixbuf. This allows you to efficiently read
-+ * individual pixels from cairo surfaces. For #GdkWindows, use
-+ * gdk_pixbuf_get_from_window() instead.
-+ *
-+ * This function will create an RGB pixbuf with 8 bits per channel.
-+ * The pixbuf will contain an alpha channel if the @surface contains one.
-+ *
-+ * Return value: (transfer full): A newly-created pixbuf with a reference
-+ *     count of 1, or %NULL on error
-+ */
-+static GdkPixbuf *
-+gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
-+                              gint             src_x,
-+                              gint             src_y,
-+                              gint             width,
-+                              gint             height)
-+{
-+  cairo_content_t content;
-+  GdkPixbuf *dest;
-+
-+  /* General sanity checks */
-+  g_return_val_if_fail (surface != NULL, NULL);
-+  g_return_val_if_fail (width > 0 && height > 0, NULL);
-+
-+  content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR;
-+  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-+                         !!(content & CAIRO_CONTENT_ALPHA),
-+                         8,
-+                         width, height);
-+
-+  surface = gdk_cairo_surface_coerce_to_image (surface, content,
-+                                               src_x, src_y,
-+                                               width, height);
-+  cairo_surface_flush (surface);
-+  if (cairo_surface_status (surface) || dest == NULL)
-+    {
-+      cairo_surface_destroy (surface);
-+      return NULL;
-+    }
-+
-+  if (gdk_pixbuf_get_has_alpha (dest))
-+    convert_alpha (gdk_pixbuf_get_pixels (dest),
-+                   gdk_pixbuf_get_rowstride (dest),
-+                   cairo_image_surface_get_data (surface),
-+                   cairo_image_surface_get_stride (surface),
-+                   0, 0,
-+                   width, height);
-+  else
-+    convert_no_alpha (gdk_pixbuf_get_pixels (dest),
-+                      gdk_pixbuf_get_rowstride (dest),
-+                      cairo_image_surface_get_data (surface),
-+                      cairo_image_surface_get_stride (surface),
-+                      0, 0,
-+                      width, height);
-+
-+  cairo_surface_destroy (surface);
-+  return dest;
-+}
-+
-+#endif
-+
- static gint32
- layer_from_pixbuf (gint32        image,
-                    const gchar  *layer_name,
-@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32        image,
-   return layer;
- }
- 
-+static cairo_surface_t *
-+render_page_to_surface (PopplerPage *page,
-+                        int          width,
-+                        int          height,
-+                        double       scale)
-+{
-+  cairo_surface_t *surface;
-+  cairo_t *cr;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-+  cr = cairo_create (surface);
-+
-+  cairo_save (cr);
-+  cairo_translate (cr, 0.0, 0.0);
-+
-+  if (scale != 1.0)
-+    cairo_scale (cr, scale, scale);
-+
-+  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+render_page_to_pixbuf (PopplerPage *page,
-+                       int          width,
-+                       int          height,
-+                       double       scale)
-+{
-+  GdkPixbuf *pixbuf;
-+  cairo_surface_t *surface;
-+
-+  surface = render_page_to_surface (page, width, height, scale);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-+  return pixbuf;
-+}
-+
- static gint32
- load_image (PopplerDocument        *doc,
-             const gchar            *filename,
-@@ -597,7 +837,7 @@ load_image (PopplerDocument        *doc,
-       gdouble      page_width;
-       gdouble      page_height;
- 
--      GdkPixbuf   *buf;
-+      GdkPixbuf   *pixbuf;
-       gint         width;
-       gint         height;
- 
-@@ -627,15 +867,13 @@ load_image (PopplerDocument        *doc,
-           gimp_image_set_resolution (image_ID, resolution, resolution);
-         }
- 
--      buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
--
--      poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf);
-+      pixbuf = render_page_to_pixbuf (page, width, height, scale);
- 
--      layer_from_pixbuf (image_ID, page_label, i, buf,
-+      layer_from_pixbuf (image_ID, page_label, i, pixbuf,
-                          doc_progress, 1.0 / pages->n_pages);
- 
-       g_free (page_label);
--      g_object_unref (buf);
-+      g_object_unref(pixbuf);
- 
-       doc_progress = (double) (i + 1) / pages->n_pages;
-       gimp_progress_update (doc_progress);
-@@ -676,30 +914,22 @@ load_image (PopplerDocument        *doc,
-   return image_ID;
- }
- 
--static GdkPixbuf *
--get_thumbnail (PopplerDocument *doc,
--               gint             page_num,
--               gint             preferred_size)
-+static cairo_surface_t *
-+get_thumb_surface (PopplerDocument *doc,
-+                   gint             page_num,
-+                   gint             preferred_size)
- {
-   PopplerPage *page;
--  GdkPixbuf   *pixbuf;
-+  cairo_surface_t *surface;
- 
-   page = poppler_document_get_page (doc, page_num);
- 
-   if (! page)
-     return NULL;
- 
--  /* XXX: Remove conditional when we depend on poppler 0.8.0, but also
--   * add configure check to make sure POPPLER_WITH_GDK is enabled!
--   */
--#ifdef POPPLER_WITH_GDK
--  pixbuf = poppler_page_get_thumbnail_pixbuf (page);
--#else
--  pixbuf = poppler_page_get_thumbnail (page);
--#endif
--
-+  surface = poppler_page_get_thumbnail (page);
- 
--  if (! pixbuf)
-+  if (! surface)
-     {
-       gdouble width;
-       gdouble height;
-@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc,
-       width  *= scale;
-       height *= scale;
- 
--      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
--                               width, height);
--
--      poppler_page_render_to_pixbuf (page,
--                                     0, 0, width, height, scale, 0, pixbuf);
-+      surface = render_page_to_surface (page, width, height, scale);
-     }
- 
-   g_object_unref (page);
- 
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+get_thumb_pixbuf (PopplerDocument *doc,
-+                  gint             page_num,
-+                  gint             preferred_size)
-+{
-+  cairo_surface_t *surface;
-+  GdkPixbuf *pixbuf;
-+
-+  surface = get_thumb_surface (doc, page_num, preferred_size);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-   return pixbuf;
- }
- 
-@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data)
-       idle_data->page_no  = i;
- 
-       /* FIXME get preferred size from somewhere? */
--      idle_data->pixbuf = get_thumbnail (thread_data->document, i,
--                                         THUMBNAIL_SIZE);
-+      idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i,
-+                                            THUMBNAIL_SIZE);
- 
-       g_idle_add (idle_set_thumbnail, idle_data);
- 
--- 
-1.7.5
diff --git a/testing/gimp/libpng_compile.patch b/testing/gimp/libpng_compile.patch
deleted file mode 100644
index 26d3f9427..000000000
--- a/testing/gimp/libpng_compile.patch
+++ /dev/null
@@ -1,984 +0,0 @@
-Description: fix compilation against libpng 1.5
-Origin: upstream, 2.6 branch, diff of 2917a0e..e7469007
-Bug-Debian: http://bugs.debian.org/649972
-
-diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
-index 29dd155..8054504 100644
---- a/plug-ins/common/file-mng.c
-+++ b/plug-ins/common/file-mng.c
-@@ -136,7 +136,6 @@ struct mng_data_t
-   gint32 default_dispose;
- };
- 
--
- /* Values of the instance of the above struct when the plug-in is
-  * first invoked. */
- 
-@@ -160,6 +159,21 @@ static struct mng_data_t mng_data =
- };
- 
- 
-+/* These are not saved or restored. */
-+
-+struct mng_globals_t
-+{
-+  gboolean   has_trns;
-+  png_bytep  trans;
-+  int        num_trans;
-+  gboolean   has_plte;
-+  png_colorp palette;
-+  int        num_palette;
-+};
-+
-+static struct mng_globals_t mngg;
-+
-+
- /* The output FILE pointer which is used by libmng;
-  * passed around as user data. */
- struct mnglib_userdata_t
-@@ -196,7 +210,8 @@ static gboolean  respin_cmap     (png_structp       png_ptr,
-                                   png_infop         png_info_ptr,
-                                   guchar           *remap,
-                                   gint32            image_id,
--                                  GimpDrawable     *drawable);
-+                                  GimpDrawable     *drawable,
-+                                  int              *bit_depth);
- 
- static gboolean  mng_save_image  (const gchar      *filename,
-                                   gint32            image_id,
-@@ -414,6 +429,18 @@ ia_has_transparent_pixels (guchar *pixels,
-   return FALSE;
- }
- 
-+static int
-+get_bit_depth_for_palette (int num_palette)
-+{
-+  if (num_palette <= 2)
-+    return 1;
-+  else if (num_palette <= 4)
-+    return 2;
-+  else if (num_palette <= 16)
-+    return 4;
-+  else
-+    return 8;
-+}
- 
- /* Spins the color map (palette) putting the transparent color at
-  * index 0 if there is space. If there isn't any space, warn the user
-@@ -422,11 +449,12 @@ ia_has_transparent_pixels (guchar *pixels,
-  */
- 
- static gboolean
--respin_cmap (png_structp  png_ptr,
--             png_infop    png_info_ptr,
-+respin_cmap (png_structp  pp,
-+             png_infop    info,
-              guchar       *remap,
-              gint32       image_id,
--             GimpDrawable *drawable)
-+             GimpDrawable *drawable,
-+             int          *bit_depth)
- {
-   static guchar  trans[] = { 0 };
-   guchar        *before;
-@@ -464,10 +492,13 @@ respin_cmap (png_structp  png_ptr,
- 
-       if (transparent != -1)
-         {
--          png_color palette[256] = { {0, 0, 0} };
-+          static png_color palette[256] = { {0, 0, 0} };
-           gint i;
- 
--          png_set_tRNS (png_ptr, png_info_ptr, (png_bytep) trans, 1, NULL);
-+          /* Set tRNS chunk values for writing later. */
-+          mngg.has_trns = TRUE;
-+          mngg.trans = trans;
-+          mngg.num_trans = 1;
- 
-           /* Transform all pixels with a value = transparent to
-            * 0 and vice versa to compensate for re-ordering in palette
-@@ -489,7 +520,12 @@ respin_cmap (png_structp  png_ptr,
-               palette[i].blue = before[3 * remap[i] + 2];
-             }
- 
--          png_set_PLTE (png_ptr, png_info_ptr, (png_colorp) palette, colors);
-+          /* Set PLTE chunk values for writing later. */
-+          mngg.has_plte = TRUE;
-+          mngg.palette = palette;
-+          mngg.num_palette = colors;
-+
-+          *bit_depth = get_bit_depth_for_palette (colors);
- 
-           return TRUE;
-         }
-@@ -500,7 +536,10 @@ respin_cmap (png_structp  png_ptr,
-         }
-     }
- 
--  png_set_PLTE (png_ptr, png_info_ptr, (png_colorp) before, colors);
-+  mngg.has_plte = TRUE;
-+  mngg.palette = (png_colorp) before;
-+  mngg.num_palette = colors;
-+  *bit_depth = get_bit_depth_for_palette (colors);
- 
-   return FALSE;
- }
-@@ -777,7 +816,6 @@ mng_save_image (const gchar  *filename,
- 
-   for (i = (num_layers - 1); i >= 0; i--)
-     {
--      gint            num_colors;
-       GimpImageType   layer_drawable_type;
-       GimpDrawable   *layer_drawable;
-       gint            layer_offset_x, layer_offset_y;
-@@ -795,8 +833,8 @@ mng_save_image (const gchar  *filename,
-       gchar           frame_mode;
-       int             frame_delay;
-       gchar          *temp_file_name;
--      png_structp     png_ptr;
--      png_infop       png_info_ptr;
-+      png_structp     pp;
-+      png_infop       info;
-       FILE           *infile, *outfile;
-       int             num_passes;
-       int             tile_height;
-@@ -804,6 +842,8 @@ mng_save_image (const gchar  *filename,
-       int             pass, j, k, begin, end, num;
-       guchar         *fixed;
-       guchar          layer_remap[256];
-+      int             color_type;
-+      int             bit_depth;
- 
-       layer_name          = gimp_drawable_get_name (layers[i]);
-       layer_chunks_type   = parse_chunks_type_from_layer_name (layer_name);
-@@ -948,9 +988,9 @@ mng_save_image (const gchar  *filename,
-           goto err3;
-         }
- 
--      png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING,
-+      pp = png_create_write_struct (PNG_LIBPNG_VER_STRING,
-                                          NULL, NULL, NULL);
--      if (NULL == png_ptr)
-+      if (NULL == pp)
-         {
-           g_warning ("Unable to png_create_write_struct() in mng_save_image()");
-           fclose (outfile);
-@@ -958,89 +998,97 @@ mng_save_image (const gchar  *filename,
-           goto err3;
-         }
- 
--      png_info_ptr = png_create_info_struct (png_ptr);
--      if (NULL == png_info_ptr)
-+      info = png_create_info_struct (pp);
-+      if (NULL == info)
-         {
-           g_warning
-             ("Unable to png_create_info_struct() in mng_save_image()");
--          png_destroy_write_struct (&png_ptr, NULL);
-+          png_destroy_write_struct (&pp, NULL);
-           fclose (outfile);
-           g_unlink (temp_file_name);
-           goto err3;
-         }
- 
--      if (setjmp (png_ptr->jmpbuf) != 0)
-+      if (setjmp (png_jmpbuf (pp)) != 0)
-         {
-           g_warning ("HRM saving PNG in mng_save_image()");
--          png_destroy_write_struct (&png_ptr, &png_info_ptr);
-+          png_destroy_write_struct (&pp, &info);
-           fclose (outfile);
-           g_unlink (temp_file_name);
-           goto err3;
-         }
- 
--      png_init_io (png_ptr, outfile);
--      png_set_compression_level (png_ptr, mng_data.compression_level);
-+      png_init_io (pp, outfile);
- 
--      png_info_ptr->width = layer_cols;
--      png_info_ptr->height = layer_rows;
--      png_info_ptr->interlace_type = (mng_data.interlaced == 0 ? 0 : 1);
--      png_info_ptr->bit_depth = 8;
-+      bit_depth = 8;
- 
-       switch (layer_drawable_type)
-         {
-         case GIMP_RGB_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+          color_type = PNG_COLOR_TYPE_RGB;
-           break;
-         case GIMP_RGBA_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+          color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-           break;
-         case GIMP_GRAY_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+          color_type = PNG_COLOR_TYPE_GRAY;
-           break;
-         case GIMP_GRAYA_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+          color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-           break;
-         case GIMP_INDEXED_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--          png_info_ptr->valid |= PNG_INFO_PLTE;
--          png_info_ptr->palette =
--            (png_colorp) gimp_image_get_colormap (image_id, &num_colors);
--          png_info_ptr->num_palette = num_colors;
-+          color_type = PNG_COLOR_TYPE_PALETTE;
-+          mngg.has_plte = TRUE;
-+          mngg.palette = (png_colorp)
-+            gimp_image_get_colormap (image_id, &mngg.num_palette);
-+          bit_depth = get_bit_depth_for_palette (mngg.num_palette);
-           break;
-         case GIMP_INDEXEDA_IMAGE:
--          png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+          color_type = PNG_COLOR_TYPE_PALETTE;
-           layer_has_unique_palette =
--            respin_cmap (png_ptr, png_info_ptr, layer_remap,
--                         image_id, layer_drawable);
-+            respin_cmap (pp, info, layer_remap,
-+                         image_id, layer_drawable,
-+                         &bit_depth);
-           break;
-         default:
-           g_warning ("This can't be!\n");
--          png_destroy_write_struct (&png_ptr, &png_info_ptr);
-+          png_destroy_write_struct (&pp, &info);
-           fclose (outfile);
-           g_unlink (temp_file_name);
-           goto err3;
-         }
- 
--      if ((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE)
-+      /* Note: png_set_IHDR() must be called before any other
-+         png_set_*() functions. */
-+      png_set_IHDR (pp, info, layer_cols, layer_rows,
-+                bit_depth,
-+                color_type,
-+                mng_data.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
-+                PNG_COMPRESSION_TYPE_BASE,
-+                PNG_FILTER_TYPE_BASE);
-+
-+      if (mngg.has_trns)
-+        {
-+          png_set_tRNS (pp, info, mngg.trans, mngg.num_trans, NULL);
-+        }
-+
-+      if (mngg.has_plte)
-         {
--          if (png_info_ptr->num_palette <= 2)
--            png_info_ptr->bit_depth = 1;
--          else if (png_info_ptr->num_palette <= 4)
--            png_info_ptr->bit_depth = 2;
--          else if (png_info_ptr->num_palette <= 16)
--            png_info_ptr->bit_depth = 4;
-+          png_set_PLTE (pp, info, mngg.palette, mngg.num_palette);
-         }
- 
--      png_write_info (png_ptr, png_info_ptr);
-+      png_set_compression_level (pp, mng_data.compression_level);
-+
-+      png_write_info (pp, info);
- 
-       if (mng_data.interlaced != 0)
--        num_passes = png_set_interlace_handling (png_ptr);
-+        num_passes = png_set_interlace_handling (pp);
-       else
-         num_passes = 1;
- 
--      if ((png_info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) &&
--          (png_info_ptr->bit_depth < 8))
--        png_set_packing (png_ptr);
-+      if ((color_type == PNG_COLOR_TYPE_PALETTE) &&
-+          (bit_depth < 8))
-+        png_set_packing (pp);
- 
-       tile_height = gimp_tile_height ();
-       layer_pixel = g_new (guchar, tile_height * layer_cols * layer_bpp);
-@@ -1065,7 +1113,7 @@ mng_save_image (const gchar  *filename,
-               gimp_pixel_rgn_get_rect (&layer_pixel_rgn, layer_pixel, 0,
-                                        begin, layer_cols, num);
- 
--              if ((png_info_ptr->valid & PNG_INFO_tRNS) == PNG_INFO_tRNS)
-+              if (png_get_valid (pp, info, PNG_INFO_tRNS))
-                 {
-                   for (j = 0; j < num; j++)
-                     {
-@@ -1077,7 +1125,7 @@ mng_save_image (const gchar  *filename,
-                     }
-                 }
-               else
--                if (((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE)
-+                if (png_get_valid (pp, info, PNG_INFO_PLTE)
-                     && (layer_bpp == 2))
-                 {
-                   for (j = 0; j < num; j++)
-@@ -1089,12 +1137,12 @@ mng_save_image (const gchar  *filename,
-                     }
-                 }
- 
--              png_write_rows (png_ptr, layer_pixels, num);
-+              png_write_rows (pp, layer_pixels, num);
-             }
-         }
- 
--      png_write_end (png_ptr, png_info_ptr);
--      png_destroy_write_struct (&png_ptr, &png_info_ptr);
-+      png_write_end (pp, info);
-+      png_destroy_write_struct (&pp, &info);
- 
-       g_free (layer_pixels);
-       g_free (layer_pixel);
-diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
-index d42afff..8fa8983 100644
---- a/plug-ins/common/file-png.c
-+++ b/plug-ins/common/file-png.c
-@@ -106,6 +106,17 @@ typedef struct
- }
- PngSaveGui;
- 
-+/* These are not saved or restored. */
-+typedef struct
-+{
-+  gboolean   has_trns;
-+  png_bytep  trans;
-+  int        num_trans;
-+  gboolean   has_plte;
-+  png_colorp palette;
-+  int        num_palette;
-+}
-+PngGlobals;
- 
- /*
-  * Local functions...
-@@ -127,7 +138,7 @@ static gboolean  save_image                (const gchar      *filename,
-                                             gint32            orig_image_ID,
-                                             GError          **error);
- 
--static void      respin_cmap               (png_structp       pp,
-+static int       respin_cmap               (png_structp       pp,
-                                             png_infop         info,
-                                             guchar           *remap,
-                                             gint32            image_ID,
-@@ -175,6 +186,7 @@ static const PngSaveVals defaults =
- };
- 
- static PngSaveVals pngvals;
-+static PngGlobals pngg;
- 
- 
- /*
-@@ -653,13 +665,25 @@ on_read_error (png_structp png_ptr, png_const_charp error_msg)
-                                 error_data->drawable->width, num);
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
-+}
-+
-+static int
-+get_bit_depth_for_palette (int num_palette)
-+{
-+  if (num_palette <= 2)
-+    return 1;
-+  else if (num_palette <= 4)
-+    return 2;
-+  else if (num_palette <= 16)
-+    return 4;
-+  else
-+    return 8;
- }
- 
- /*
-  * 'load_image()' - Load a PNG image into a new image window.
-  */
--
- static gint32
- load_image (const gchar  *filename,
-             gboolean      interactive,
-@@ -695,9 +719,20 @@ load_image (const gchar  *filename,
-   gint       num_texts;
- 
-   pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+  if (!pp)
-+    {
-+      /* this could happen if the compile time and run-time libpng
-+         versions do not match. */
-+
-+      g_set_error (error, 0, 0,
-+                   _("Error creating PNG read struct while saving '%s'."),
-+                   gimp_filename_to_utf8 (filename));
-+      return -1;
-+    }
-+
-   info = png_create_info_struct (pp);
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf (pp)))
-     {
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Error while reading '%s'. File corrupted?"),
-@@ -705,10 +740,6 @@ load_image (const gchar  *filename,
-       return image;
-     }
- 
--  /* initialise image here, thus avoiding compiler warnings */
--
--  image = -1;
--
-   /*
-    * Open the file and initialize the PNG read "engine"...
-    */
-@@ -738,17 +769,19 @@ load_image (const gchar  *filename,
-    * Latest attempt, this should be my best yet :)
-    */
- 
--  if (info->bit_depth == 16)
-+  if (png_get_bit_depth (pp, info) == 16)
-     {
-       png_set_strip_16 (pp);
-     }
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8)
-+  if (png_get_color_type (pp, info) == PNG_COLOR_TYPE_GRAY &&
-+      png_get_bit_depth (pp, info) < 8)
-     {
-       png_set_expand (pp);
-     }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (png_get_color_type (pp, info) == PNG_COLOR_TYPE_PALETTE &&
-+      png_get_bit_depth (pp, info) < 8)
-     {
-       png_set_packing (pp);
-     }
-@@ -757,8 +790,8 @@ load_image (const gchar  *filename,
-    * Expand G+tRNS to GA, RGB+tRNS to RGBA
-    */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--      (info->valid & PNG_INFO_tRNS))
-+  if (png_get_color_type (pp, info) != PNG_COLOR_TYPE_PALETTE &&
-+      png_get_valid (pp, info, PNG_INFO_tRNS))
-     {
-       png_set_expand (pp);
-     }
-@@ -775,7 +808,7 @@ load_image (const gchar  *filename,
-    */
- 
-   if (png_get_valid (pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      png_get_color_type (pp, info) == PNG_COLOR_TYPE_PALETTE)
-     {
-       png_get_tRNS (pp, info, &alpha_ptr, &num, NULL);
-       /* Copy the existing alpha values from the tRNS chunk */
-@@ -797,7 +830,7 @@ load_image (const gchar  *filename,
- 
-   png_read_update_info (pp, info);
- 
--  switch (info->color_type)
-+  switch (png_get_color_type (pp, info))
-     {
-     case PNG_COLOR_TYPE_RGB:           /* RGB */
-       bpp = 3;
-@@ -836,7 +869,9 @@ load_image (const gchar  *filename,
-       return -1;
-     }
- 
--  image = gimp_image_new (info->width, info->height, image_type);
-+  image = gimp_image_new (png_get_image_width (pp, info),
-+                          png_get_image_height (pp, info),
-+                          image_type);
-   if (image == -1)
-     {
-       g_set_error (error, 0, 0,
-@@ -849,7 +884,9 @@ load_image (const gchar  *filename,
-    * Create the "background" layer to hold the image...
-    */
- 
--  layer = gimp_layer_new (image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new (image, _("Background"),
-+                          png_get_image_width (pp, info),
-+                          png_get_image_height (pp, info),
-                           layer_type, 100, GIMP_NORMAL_MODE);
-   gimp_image_add_layer (image, layer, 0);
- 
-@@ -883,7 +920,8 @@ load_image (const gchar  *filename,
- 
-       gimp_layer_set_offsets (layer, offset_x, offset_y);
- 
--      if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height))
-+      if ((abs (offset_x) > png_get_image_width (pp, info)) ||
-+          (abs (offset_y) > png_get_image_height (pp, info)))
-         {
-           if (interactive)
-             g_message (_("The PNG file specifies an offset that caused "
-@@ -938,23 +976,27 @@ load_image (const gchar  *filename,
- 
-   empty = 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE)
-+  if (png_get_color_type (pp, info) & PNG_COLOR_MASK_PALETTE)
-     {
-+      png_colorp palette;
-+      int num_palette;
-+
-+      png_get_PLTE (pp, info, &palette, &num_palette);
-       if (png_get_valid (pp, info, PNG_INFO_tRNS))
-         {
-           for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty)
-             /* Calculates number of fully transparent "empty" entries */;
- 
-           /*  keep at least one entry  */
--          empty = MIN (empty, info->num_palette - 1);
-+          empty = MIN (empty, num_palette - 1);
- 
--          gimp_image_set_colormap (image, (guchar *) (info->palette + empty),
--                                   info->num_palette - empty);
-+          gimp_image_set_colormap (image, (guchar *) (palette + empty),
-+                                   num_palette - empty);
-         }
-       else
-         {
--          gimp_image_set_colormap (image, (guchar *) info->palette,
--                                   info->num_palette);
-+          gimp_image_set_colormap (image, (guchar *) palette,
-+                                   num_palette);
-         }
-     }
- 
-@@ -972,18 +1014,19 @@ load_image (const gchar  *filename,
-    */
- 
-   tile_height = gimp_tile_height ();
--  pixel = g_new0 (guchar, tile_height * info->width * bpp);
-+  pixel = g_new0 (guchar, tile_height * png_get_image_width (pp, info) * bpp);
-   pixels = g_new (guchar *, tile_height);
- 
-   for (i = 0; i < tile_height; i++)
--    pixels[i] = pixel + info->width * info->channels * i;
-+    pixels[i] = pixel + png_get_image_width (pp, info) *
-+      png_get_channels (pp, info) * i;
- 
-   /* Install our own error handler to handle incomplete PNG files better */
-   error_data.drawable    = drawable;
-   error_data.pixel       = pixel;
-   error_data.tile_height = tile_height;
--  error_data.width       = info->width;
--  error_data.height      = info->height;
-+  error_data.width       = png_get_image_width (pp, info);
-+  error_data.height      = png_get_image_height (pp, info);
-   error_data.bpp         = bpp;
-   error_data.pixel_rgn   = &pixel_rgn;
- 
-@@ -996,10 +1039,11 @@ load_image (const gchar  *filename,
-        */
- 
-       for (begin = 0, end = tile_height;
--           begin < info->height; begin += tile_height, end += tile_height)
-+           begin < png_get_image_height (pp, info);
-+           begin += tile_height, end += tile_height)
-         {
--          if (end > info->height)
--            end = info->height;
-+          if (end > png_get_image_height (pp, info))
-+            end = png_get_image_height (pp, info);
- 
-           num = end - begin;
- 
-@@ -1016,11 +1060,13 @@ load_image (const gchar  *filename,
-           gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin,
-                                    drawable->width, num);
- 
--          memset (pixel, 0, tile_height * info->width * bpp);
-+          memset (pixel, 0,
-+                  tile_height * png_get_image_width (pp, info) * bpp);
- 
--          gimp_progress_update (((gdouble) pass +
--                                 (gdouble) end / (gdouble) info->height) /
--                                (gdouble) num_passes);
-+          gimp_progress_update
-+            (((gdouble) pass +
-+              (gdouble) end / (gdouble) png_get_image_height (pp, info)) /
-+             (gdouble) num_passes);
-         }
-     }
- 
-@@ -1189,7 +1235,6 @@ save_image (const gchar  *filename,
-   GimpPixelRgn pixel_rgn;       /* Pixel region for layer */
-   png_structp pp;               /* PNG read pointer */
-   png_infop info;               /* PNG info pointer */
--  gint num_colors;              /* Number of colors in colormap */
-   gint offx, offy;              /* Drawable offsets from origin */
-   guchar **pixels,              /* Pixel rows */
-    *fixed,                      /* Fixed-up pixel data */
-@@ -1200,56 +1245,28 @@ save_image (const gchar  *filename,
-   guchar red, green, blue;      /* Used for palette background */
-   time_t cutime;                /* Time since epoch */
-   struct tm *gmt;               /* GMT broken down */
-+  int color_type;
-+  int bit_depth;
- 
-   guchar remap[256];            /* Re-mapping for the palette */
- 
-   png_textp  text = NULL;
- 
--  if (pngvals.comment)
-+  pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+  if (!pp)
-     {
--      GimpParasite *parasite;
--      gsize text_length = 0;
--
--      parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
--      if (parasite)
--        {
--          gchar *comment = g_strndup (gimp_parasite_data (parasite),
--                                      gimp_parasite_data_size (parasite));
-+      /* this could happen if the compile time and run-time libpng
-+         versions do not match. */
- 
--          gimp_parasite_free (parasite);
--
--          text = g_new0 (png_text, 1);
--          text->key         = "Comment";
--
--#ifdef PNG_iTXt_SUPPORTED
--
--          text->compression = PNG_ITXT_COMPRESSION_NONE;
--          text->text        = comment;
--          text->itxt_length = strlen (comment);
--
--#else
--
--          text->compression = PNG_TEXT_COMPRESSION_NONE;
--          text->text        = g_convert (comment, -1,
--                                         "ISO-8859-1", "UTF-8",
--                                         NULL, &text_length,
--                                         NULL);
--          text->text_length = text_length;
--
--#endif
--
--          if (!text->text)
--            {
--              g_free (text);
--              text = NULL;
--            }
--        }
-+      g_set_error (error, 0, 0,
-+                   _("Error creating PNG write struct while saving '%s'."),
-+                   gimp_filename_to_utf8 (filename));
-+      return FALSE;
-     }
- 
--  pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-   info = png_create_info_struct (pp);
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf (pp)))
-     {
-       g_set_error (error, 0, 0,
-                    _("Error while saving '%s'. Could not save image."),
-@@ -1257,9 +1274,6 @@ save_image (const gchar  *filename,
-       return FALSE;
-     }
- 
--  if (text)
--    png_set_text (pp, info, text, 1);
--
-   /*
-    * Open the file and initialize the PNG write "engine"...
-    */
-@@ -1286,17 +1300,6 @@ save_image (const gchar  *filename,
-   type = gimp_drawable_type (drawable_ID);
- 
-   /*
--   * Set the image dimensions, bit depth, interlacing and compression
--   */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->bit_depth      = 8;
--  info->interlace_type = pngvals.interlaced;
--
--  /*
-    * Initialise remap[]
-    */
-   for (i = 0; i < 256; i++)
-@@ -1306,42 +1309,44 @@ save_image (const gchar  *filename,
-    * Set color type and remember bytes per pixel count
-    */
- 
-+  bit_depth = 8;
-+
-   switch (type)
-     {
-     case GIMP_RGB_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_RGB;
-+      color_type = PNG_COLOR_TYPE_RGB;
-       bpp = 3;
-       break;
- 
-     case GIMP_RGBA_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+      color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-       bpp = 4;
-       break;
- 
-     case GIMP_GRAY_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_GRAY;
-+      color_type = PNG_COLOR_TYPE_GRAY;
-       bpp = 1;
-       break;
- 
-     case GIMP_GRAYA_IMAGE:
--      info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+      color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-       bpp = 2;
-       break;
- 
-     case GIMP_INDEXED_IMAGE:
-       bpp = 1;
--      info->color_type = PNG_COLOR_TYPE_PALETTE;
--      info->valid |= PNG_INFO_PLTE;
--      info->palette =
--        (png_colorp) gimp_image_get_colormap (image_ID, &num_colors);
--      info->num_palette = num_colors;
-+      color_type = PNG_COLOR_TYPE_PALETTE;
-+      pngg.has_plte = TRUE;
-+      pngg.palette = (png_colorp) gimp_image_get_colormap (image_ID,
-+                                                           &pngg.num_palette);
-+      bit_depth = get_bit_depth_for_palette (pngg.num_palette);
-       break;
- 
-     case GIMP_INDEXEDA_IMAGE:
-       bpp = 2;
--      info->color_type = PNG_COLOR_TYPE_PALETTE;
-+      color_type = PNG_COLOR_TYPE_PALETTE;
-       /* fix up transparency */
--      respin_cmap (pp, info, remap, image_ID, drawable);
-+      bit_depth = respin_cmap (pp, info, remap, image_ID, drawable);
-       break;
- 
-     default:
-@@ -1349,21 +1354,29 @@ save_image (const gchar  *filename,
-       return FALSE;
-     }
- 
--  /*
--   * Fix bit depths for (possibly) smaller colormap images
--   */
-+  /* Note: png_set_IHDR() must be called before any other png_set_*()
-+     functions. */
-+  png_set_IHDR (pp, info, drawable->width, drawable->height,
-+                bit_depth,
-+                color_type,
-+                pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
-+                PNG_COMPRESSION_TYPE_BASE,
-+                PNG_FILTER_TYPE_BASE);
-+
-+  if (pngg.has_trns)
-+    {
-+      png_set_tRNS (pp, info, pngg.trans, pngg.num_trans, NULL);
-+    }
- 
--  if (info->valid & PNG_INFO_PLTE)
-+  if (pngg.has_plte)
-     {
--      if (info->num_palette <= 2)
--        info->bit_depth = 1;
--      else if (info->num_palette <= 4)
--        info->bit_depth = 2;
--      else if (info->num_palette <= 16)
--        info->bit_depth = 4;
--      /* otherwise the default is fine */
-+      png_set_PLTE (pp, info, pngg.palette, pngg.num_palette);
-     }
- 
-+  /* Set the compression level */
-+
-+  png_set_compression_level (pp, pngvals.compression_level);
-+
-   /* All this stuff is optional extras, if the user is aiming for smallest
-      possible file size she can turn them all off */
- 
-@@ -1462,6 +1475,52 @@ save_image (const gchar  *filename,
-   }
- #endif
- 
-+  if (pngvals.comment)
-+    {
-+      GimpParasite *parasite;
-+#ifndef PNG_iTXt_SUPPORTED
-+      gsize text_length = 0;
-+#endif /* PNG_iTXt_SUPPORTED */
-+
-+      parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
-+      if (parasite)
-+        {
-+          gchar *comment = g_strndup (gimp_parasite_data (parasite),
-+                                      gimp_parasite_data_size (parasite));
-+
-+          gimp_parasite_free (parasite);
-+
-+          text = g_new0 (png_text, 1);
-+          text->key         = "Comment";
-+
-+#ifdef PNG_iTXt_SUPPORTED
-+
-+          text->compression = PNG_ITXT_COMPRESSION_NONE;
-+          text->text        = comment;
-+          text->itxt_length = strlen (comment);
-+
-+#else
-+
-+          text->compression = PNG_TEXT_COMPRESSION_NONE;
-+          text->text        = g_convert (comment, -1,
-+                                         "ISO-8859-1", "UTF-8",
-+                                         NULL, &text_length,
-+                                         NULL);
-+          text->text_length = text_length;
-+
-+#endif
-+
-+          if (!text->text)
-+            {
-+              g_free (text);
-+              text = NULL;
-+            }
-+        }
-+    }
-+
-+  if (text)
-+    png_set_text (pp, info, text, 1);
-+
-   png_write_info (pp, info);
- 
-   /*
-@@ -1477,7 +1536,8 @@ save_image (const gchar  *filename,
-    * Convert unpacked pixels to packed if necessary
-    */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE &&
-+      bit_depth < 8)
-     png_set_packing (pp);
- 
-   /*
-@@ -1507,7 +1567,9 @@ save_image (const gchar  *filename,
- 
-           gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin,
-                                    drawable->width, num);
--          /*if we are with a RGBA image and have to pre-multiply the alpha channel */
-+
-+          /* If we are with a RGBA image and have to pre-multiply the
-+             alpha channel */
-           if (bpp == 4 && ! pngvals.save_transp_pixels)
-             {
-               for (i = 0; i < num; ++i)
-@@ -1529,7 +1591,7 @@ save_image (const gchar  *filename,
- 
-           /* If we're dealing with a paletted image with
-            * transparency set, write out the remapped palette */
--          if (info->valid & PNG_INFO_tRNS)
-+          if (png_get_valid (pp, info, PNG_INFO_tRNS))
-             {
-               guchar inverse_remap[256];
- 
-@@ -1547,9 +1609,11 @@ save_image (const gchar  *filename,
-                     }
-                 }
-             }
-+
-           /* Otherwise if we have a paletted image and transparency
-            * couldn't be set, we ignore the alpha channel */
--          else if (info->valid & PNG_INFO_PLTE && bpp == 2)
-+          else if (png_get_valid (pp, info, PNG_INFO_PLTE) &&
-+                   bpp == 2)
-             {
-               for (i = 0; i < num; ++i)
-                 {
-@@ -1564,7 +1628,7 @@ save_image (const gchar  *filename,
-           png_write_rows (pp, pixels, num);
- 
-           gimp_progress_update (((double) pass + (double) end /
--                                 (double) info->height) /
-+                                 (double) drawable->height) /
-                                 (double) num_passes);
-         }
-     }
-@@ -1694,14 +1758,14 @@ find_unused_ia_color (GimpDrawable *drawable,
- }
- 
- 
--static void
-+static int
- respin_cmap (png_structp   pp,
-              png_infop     info,
-              guchar       *remap,
-              gint32        image_ID,
-              GimpDrawable *drawable)
- {
--  static const guchar trans[] = { 0 };
-+  static guchar trans[] = { 0 };
- 
-   gint          colors;
-   guchar       *before;
-@@ -1728,10 +1792,13 @@ respin_cmap (png_structp   pp,
-                                      * index - do like gif2png and swap
-                                      * index 0 and index transparent */
-         {
--          png_color palette[256];
-+          static png_color palette[256];
-           gint      i;
- 
--          png_set_tRNS (pp, info, (png_bytep) trans, 1, NULL);
-+          /* Set tRNS chunk values for writing later. */
-+          pngg.has_trns = TRUE;
-+          pngg.trans = trans;
-+          pngg.num_trans = 1;
- 
-           /* Transform all pixels with a value = transparent to
-            * 0 and vice versa to compensate for re-ordering in palette
-@@ -1752,7 +1819,10 @@ respin_cmap (png_structp   pp,
-               palette[i].blue = before[3 * remap[i] + 2];
-             }
- 
--          png_set_PLTE (pp, info, palette, colors);
-+          /* Set PLTE chunk values for writing later. */
-+          pngg.has_plte = TRUE;
-+          pngg.palette = palette;
-+          pngg.num_palette = colors;
-         }
-       else
-         {
-@@ -1760,14 +1830,22 @@ respin_cmap (png_structp   pp,
-            * transparency & just use the full palette */
-           g_message (_("Couldn't losslessly save transparency, "
-                        "saving opacity instead."));
--          png_set_PLTE (pp, info, (png_colorp) before, colors);
-+
-+          /* Set PLTE chunk values for writing later. */
-+          pngg.has_plte = TRUE;
-+          pngg.palette = (png_colorp) before;
-+          pngg.num_palette = colors;
-         }
-     }
-   else
-     {
--      png_set_PLTE (pp, info, (png_colorp) before, colors);
-+      /* Set PLTE chunk values for writing later. */
-+      pngg.has_plte = TRUE;
-+      pngg.palette = (png_colorp) before;
-+      pngg.num_palette = colors;
-     }
- 
-+  return get_bit_depth_for_palette (colors);
- }
- 
- static gboolean
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index 3b2e90eab..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,223 +0,0 @@
-# $Id: PKGBUILD 147653 2012-01-26 00:36:18Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-pkgname=glibc
-pkgver=2.15
-pkgrel=4
-_glibcdate=20111227
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=3.1.6' 'tzdata')
-makedepends=('gcc>=4.6')
-backup=(etc/gai.conf
-        etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
-        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
-        glibc-__i686.patch
-        glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
-        glibc-2.14-reexport-rpc-interface.patch
-        glibc-2.14-reinstall-nis-rpc-headers.patch
-        glibc-2.15-regex.patch
-        glibc-2.15-lddebug-scopes.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.15-strcmp-disable-avx.patch
-        nscd
-        locale.gen.txt
-        locale-gen)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         'b3526cbd5e29773560dba725db99af5a'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         '7a44dd821835e4984aa75ad44fad3baf'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-mksource() {
-  git clone git://sourceware.org/git/glibc.git
-  pushd glibc
-  #git checkout -b glibc-2.15-arch origin/release/2.15/master
-  git checkout -b glibc-2.15-arch origin/master
-  popd
-  tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
-}
-
-build() {
-  cd ${srcdir}/glibc
-
-  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
-  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
-  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
-  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely:
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
-  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
-  # Fix up regcomp/regexec
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
-  patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
-
-  # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=769421
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # Disable AVX in strcmp as this breaks Xen
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13583
-  patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch
-
-  # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743)
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13618
-  rm sysdeps/x86_64/fpu/multiarch/*
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  fi
-
-  echo "slibdir=/lib" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --enable-multi-arch
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "s#=no#=yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
-
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
-  install -dm755 ${pkgdir}/etc/rc.d
-  install -dm755 ${pkgdir}/usr/sbin
-  install -dm755 ${pkgdir}/usr/lib/locale
-  install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-  install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
-  cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-  sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix for the linker
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    # Comply with multilib binaries, they look for the linker in /lib64
-    mkdir ${pkgdir}/lib64
-    cd ${pkgdir}/lib64
-    ln -v -s ../lib/ld* .
-  fi
-  
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
-  cd $pkgdir
-  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-                        usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
-                        usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
-                        usr/lib/getconf/* \
-                        usr/sbin/{iconvconfig,nscd}
-  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
-  strip $STRIP_STATIC usr/lib/*.a
-
-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/testing/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/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.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }
--- 
-1.7.2
diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/testing/glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- 
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/testing/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/testing/glibc/glibc-2.15-lddebug-scopes.patch b/testing/glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/testing/glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	      char *copy = malloc (len);
- 	      if (copy == NULL)
- 		_dl_fatal_printf ("out of memory\n");
--	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+	      l->l_libname->name = memcpy (copy, dsoname, len);
-+	      if (GLRO(dl_debug_mask))
-+		l->l_name = copy;
- 	    }
- 
- 	  /* Add the vDSO to the object list.  */
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-regex.patch b/testing/glibc/glibc-2.15-regex.patch
deleted file mode 100644
index 6385f2c08..000000000
--- a/testing/glibc/glibc-2.15-regex.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/posix/regex_internal.c b/posix/regex_internal.c
-index bc19243..124f8cc 100644
---- a/posix/regex_internal.c
-+++ b/posix/regex_internal.c
-@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx)
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-revert-c5a0802a.patch b/testing/glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/testing/glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	18f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- 	movl	%ebp, %edx
- 	xorl	%esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- 	sete	16(%esp)
- 	je	19f
- 
--	cmpl	$-EAGAIN, %eax
--	je	91f
--
- 	/* Normal and PI futexes dont mix. Use normal futex functions only
- 	   if the kernel does not support the PI futex functions.  */
- 	cmpl	$-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- 	call	__lll_unlock_wake
- 	jmp	11b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--
--	/* Get internal lock.  */
--	movl	$1, %edx
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %edx, (%ebx)
--#else
--	cmpxchgl %edx, cond_lock(%ebx)
--#endif
--	jz	92f
--
--#if cond_lock == 0
--	movl	%ebx, %edx
--#else
--	leal	cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_lock_wait
--
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	addl	$1, cond_futex(%ebx)
--	movl	cond_futex(%ebx), %ebp
--
--	/* Unlock.  */
--	LOCK
--#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	je	93f
--#if cond_lock == 0
--	movl	%ebx, %eax
--#else
--	leal	cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_unlock_wake
--
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorl	%ecx, %ecx
--	movl	dep_mutex(%ebx), %edi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- 	.long	.LcleanupEND-.Lsub_cond_futex
- 	.long	__condvar_w_cleanup-.LSTARTCODE
- 	.uleb128  0
--	.long	.LcleanupSTART2-.LSTARTCODE
--	.long	.LcleanupEND2-.LcleanupSTART2
--	.long	__condvar_w_cleanup-.LSTARTCODE
--	.uleb128  0
- 	.long	.LcallUR-.LSTARTCODE
- 	.long	.LENDCODE-.LcallUR
- 	.long	0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- 
- #include <kernel-features.h>
- 
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	61f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- 	movl	$SYS_futex, %eax
- 	syscall
- 
- 	movl	$1, %r8d
--	cmpq	$-EAGAIN, %rax
--	je	91f
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
- 
- 13:	movq	%r10, %rax
- 	jmp	14b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--	movq	8(%rsp), %rdi
--
--	/* Get internal lock.  */
--	movl	$1, %esi
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %esi, (%rdi)
--#else
--	cmpxchgl %esi, cond_lock(%rdi)
--#endif
--	jz	92f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	cmpq	$-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	callq	__lll_lock_wait
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	incl	cond_futex(%rdi)
--	movl	cond_futex(%rdi), %edx
--
--	/* Release internal lock.  */
--	LOCK
--#if cond_lock == 0
--	decl	(%rdi)
--#else
--	decl	cond_lock(%rdi)
--#endif
--	jz	93f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	cmpq	$-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	/* The call preserves %rdx.  */
--	callq	__lll_unlock_wake
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorq	%r10, %r10
--	movq	dep_mutex(%rdi), %r8
--	leaq	cond_futex(%rdi), %rdi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupSTART-.LSTARTCODE
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
-+	.uleb128  0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
--	.uleb128 0
-+	.uleb128  0
- .Lcstend:
- 
- 
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/testing/glibc/glibc-2.15-strcmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcmp-disable-avx.patch
deleted file mode 100644
index 7f1f5b8f2..000000000
--- a/testing/glibc/glibc-2.15-strcmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strcasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strncasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
- 
- 
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
- 	.type STRCMP_SSE2, @function; \
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/testing/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think).  Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
- 
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/testing/glibc/glibc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
-
-post_upgrade() {
-  sbin/ldconfig -r .
-  [ -x sbin/init ] && sbin/init u
-  usr/sbin/locale-gen
-  
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/testing/glibc/locale-gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LOCALEGEN=/etc/locale.gen
-LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
-  unset POSIXLY_CORRECT
-fi
-
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
-
-# Remove all old locale dir and locale-archive before generating new
-# locale data.
-rm -rf /usr/lib/locale/* || true
-
-umask 022
-
-is_entry_ok() {
-  if [ -n "$locale" -a -n "$charset" ] ; then
-    true
-  else
-    echo "error: Bad entry '$locale $charset'"
-    false
-  fi
-}
-
-echo "Generating locales..."
-while read locale charset; do \
-	case $locale in \#*) continue;; "") continue;; esac; \
-	is_entry_ok || continue
-	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
-	echo -n ".$charset"; \
-	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
-	echo -n '...'; \
-        if [ -f $LOCALES/$locale ]; then input=$locale; else \
-        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
-	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
-	echo ' done'; \
-done < $LOCALEGEN
-echo "Generation complete."
diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/testing/glibc/locale.gen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration file for locale-gen
-#
-# lists of locales that are to be generated by the locale-gen command.
-#
-# Each line is of the form:
-#
-#     <locale> <charset>
-#
-#  where <locale> is one of the locales given in /usr/share/i18n/locales
-#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
-#
-#  Examples:
-#  en_US ISO-8859-1
-#  en_US.UTF-8 UTF-8
-#  de_DE ISO-8859-1
-#  de_DE@euro ISO-8859-15
-#
-#  The locale-gen command will generate all the locales,
-#  placing them in /usr/lib/locale.
-#
-#  A list of supported locales is included in this file.
-#  Uncomment the ones you need.
-#
diff --git a/testing/glibc/nscd b/testing/glibc/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/testing/glibc/nscd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/nscd`
-case "$1" in
-  start)
-    stat_busy "Starting nscd"
-    # create necessary directories if they don't already exist
-    mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null
-    # remove stale files
-    rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null
-    [ -z "$PID" ] && /usr/sbin/nscd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nscd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nscd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nscd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/gmime/PKGBUILD b/testing/gmime/PKGBUILD
deleted file mode 100644
index 0cd358ce6..000000000
--- a/testing/gmime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146618 2012-01-14 12:24:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gmime
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="Core mime parsing library"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://spruce.sourceforge.net/gmime/"
-depends=('glib2' 'gpgme' 'zlib')
-makedepends=('gtk-sharp-2')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163')
-
-build() {
-  # get rid of that .wapi errors in fakeroot
-  export MONO_SHARED_DIR="$srcdir/weird"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gmp/538dfce27f41.patch b/testing/gmp/538dfce27f41.patch
deleted file mode 100644
index 2e0a1af50..000000000
--- a/testing/gmp/538dfce27f41.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
- 
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -28,7 +28,6 @@
- #include "gmp-impl.h"
- 
- 
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD
deleted file mode 100644
index 1915a7e6f..000000000
--- a/testing/gmp/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 147720 2012-01-27 11:26:19Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gmp
-pkgver=5.0.3
-pkgrel=1
-pkgdesc="A free library for arbitrary precision arithmetic"
-arch=('i686' 'x86_64')
-url="http://gmplib.org/"
-depends=('gcc-libs' 'sh')
-license=('LGPL3')
-options=(!libtool)
-install=gmp.install
-source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig})
-md5sums=('1e8edebe33bc3ac6de17df3201732825'
-         '9efbe14533ded9cd3ae4e998ee0efc98')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  [ "${CARCH}" = "i686" ] && export ABI="32"
-  ./configure --build=${CHOST} \
-    --prefix=/usr --infodir=/usr/share/info \
-    --enable-cxx
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gmp/gmp.install b/testing/gmp/gmp.install
deleted file mode 100644
index cad3354f9..000000000
--- a/testing/gmp/gmp.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(gmp.info gmp.info-1 gmp.info-2)
-
-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/grilo-plugins/PKGBUILD b/testing/grilo-plugins/PKGBUILD
deleted file mode 100644
index ddf708f84..000000000
--- a/testing/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 146620 2012-01-14 12:24:10Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.1.18
-pkgrel=2
-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')
-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)
-sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index 2be258c7c..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 145940 2012-01-04 13:11:36Z dreisner $
-# 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=2
-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/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/testing/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD
deleted file mode 100644
index 5d350ccbb..000000000
--- a/testing/hdparm/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 146531 2012-01-12 16:33:43Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=hdparm
-pkgver=9.38
-pkgrel=1
-pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
-arch=(i686 x86_64)
-depends=('glibc')
-optdepends=('sh: required by idectl and ultrabayd')
-source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz
-        wiper.sh.2_6.max-ranges.patch)
-license=('BSD')
-url="http://sourceforge.net/projects/hdparm/"
-optdepends=('bash: for wiper.sh script')
-options=('emptydirs')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # Fix Range input/output error when wiping Intel G2 and OCZ drives
-  patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-  
-  # build
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # install
-  mkdir -p ${pkgdir}/{usr,sbin}
-  make DESTDIR=${pkgdir} install
-  install -m755 contrib/idectl ${pkgdir}/sbin
-  install -m755 contrib/ultrabayd ${pkgdir}/sbin
-
-  install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
-  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
-
-  #install license file
-  install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
-}
-md5sums=('915e74685e2f25eaebe6a26c5d7ca700'
-         '74e368f384166a7710b447573cda120a')
diff --git a/testing/hdparm/wiper.sh.2_6.max-ranges.patch b/testing/hdparm/wiper.sh.2_6.max-ranges.patch
deleted file mode 100644
index c55f7b149..000000000
--- a/testing/hdparm/wiper.sh.2_6.max-ranges.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- hdparm-9.28/wiper/wiper.sh.orig	2010-03-09 06:17:37.000000000 -0800
---- hdparm-9.28/wiper/wiper.sh	2010-05-15 03:08:02.182856971 -0700
-@@ -29,7 +29,7 @@
- function usage_error(){
- 	echo >&2
- 	echo "Linux tune-up (TRIM) utility for SATA SSDs"
--	echo "Usage:  $0 [--verbose] [--commit] <mount_point|block_device>" >&2
-+	echo "Usage:  $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2
- 	echo "   Eg:  $0 /dev/sda1" >&2
- 	echo >&2
- 	exit 1
-@@ -44,6 +44,7 @@
- 
- export verbose=0
- commit=""
-+max_ranges=-1
- destroy_me=""
- argc=$#
- arg=""
-@@ -51,6 +52,10 @@
- 		commit=yes
- 	elif [ "$1" = "--verbose" ]; then
- 		verbose=$((verbose + 1))
-+	elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then
-+		max_ranges=$2
-+		argc=$((argc - 1))
-+		shift
- 	elif [ "$1" = "" ]; then
- 		usage_error
- 	else
-@@ -499,6 +550,18 @@
- 	fi
- fi
- 
-+## Different SSD's have a different maximum number of ranges they'll accept
-+## in a single TRIM command.
-+if [ $max_ranges -le 0 ] ; then
-+	model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'`
-+	case "$model" in
-+		SSDSA[12]*)  max_ranges=512 ;;	# Intel X18-M/X25-M
-+		OCZ-VERTEX2) max_ranges=64 ;;	# OCZ Vertex2
-+		*)           max_ranges=65535
-+	esac
-+fi
-+[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges"
-+
- ## All ready.  Now let the user know exactly what we intend to do:
- ##
- mountstatus="$fstype non-mounted"
-@@ -608,7 +671,7 @@
- 		nsectors += count;
- 		while (count > 0) {
- 			this_count  = (count > 65535) ? 65535 : count
--			printf "%u:%u ", lba, this_count
-+			printf "%u:%u \n", lba, this_count
- 			if (verbose > 1)
- 				printf "%u:%u ", lba, this_count > "/dev/stderr"
- 			lba        += this_count
-@@ -695,6 +758,22 @@
- 	-v verbose="$verbose"			\
- 	-v xfs_blksects="$xfs_blksects"		\
- 	-v xfs_agoffsets="$xfs_agoffsets"	\
--	"$GAWKPROG" | $TRIM
-+	"$GAWKPROG" | (
-+		i=0
-+		while read range ; do
-+			ranges=$ranges" "$range
-+			((i++))
-+			if [ $i -ge $max_ranges ] ; then
-+				[ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"         
-+				echo $ranges | $TRIM
-+				ranges=""
-+				i=0
-+			fi
-+		done
-+		if [ $i -gt 0 ] ; then
-+			[ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
-+ 			echo $ranges | $TRIM
-+		fi
-+	)
- 
- do_cleanup $?
-
- 	  	 
diff --git a/testing/hydrogen/PKGBUILD b/testing/hydrogen/PKGBUILD
deleted file mode 100644
index d569072cf..000000000
--- a/testing/hydrogen/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 145942 2012-01-04 13:11:39Z dreisner $
-# Maintainer: tobias <tobias@archlinux.org>
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=hydrogen
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Advanced Drum Machine"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt' 'jack')
-makedepends=('scons')
-#options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        lrdf_raptor2.patch
-        install.patch)
-md5sums=('e96f291d60e58f5d62fe616cee577dc0'
-         '2124851e890f46158189b5fa90006d40'
-         'ce3a83a069b55e46aa532b55e803c9a5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export QTDIR=/usr
-  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
-  # http://www.assembla.com/spaces/hydrogen/tickets/204
-  patch -Np0 -i "${srcdir}/install.patch"
-  scons prefix=/usr libarchive=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/hydrogen/install.patch b/testing/hydrogen/install.patch
deleted file mode 100644
index 2e6e707a1..000000000
--- a/testing/hydrogen/install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Sconstruct.org	2011-11-06 12:15:40.018119106 +0100
---- Sconstruct	2011-11-06 12:16:21.124122432 +0100
-***************
-*** 298,304 ****
-  
-          for N in glob.glob('./data/i18n/hydrogen.*'):
-              env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
-- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
-  
-  	#add every img in ./data/img to the install list. 
-  	os.path.walk("./data/img/",install_images,env) 
---- 298,303 ----
diff --git a/testing/hydrogen/lrdf_raptor2.patch b/testing/hydrogen/lrdf_raptor2.patch
deleted file mode 100644
index ec176b716..000000000
--- a/testing/hydrogen/lrdf_raptor2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
---- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
-+++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
-@@ -83,6 +83,7 @@
- 	includes.append( './' )
- 	includes.append( 'gui/src/' )
- 	includes.append( '3rdparty/install/include' )
-+	includes.append( '/usr/include/raptor2' )
- 
- 	if sys.platform == "darwin":
- 		ldflags.append( '-L/opt/local/lib' )
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
deleted file mode 100644
index 38735f95e..000000000
--- a/testing/inetutils/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 146554 2012-01-13 07:07:09Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=inetutils
-pkgver=1.9.1
-pkgrel=1
-pkgdesc="A collection of common network programs"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/inetutils/"
-license=('GPL3')
-groups=('base')
-depends=('readline' 'ncurses' 'pam')
-provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
-options=('!emptydirs')
-install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
-        dnsdomainname domainname)
-sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
-          'ff0aad9946a38915580b094dadf67e790e8a2f87'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'ac69756d6cc50157d430d863db04a5aac4688380'
-          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
-    --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
-    --without-wrap --with-pam \
-    --enable-ftp --enable-ftpd \
-    --enable-telnet --enable-telnetd \
-    --enable-talk --enable-talkd \
-    --enable-rlogin --enable-rlogind \
-    --enable-rsh --enable-rshd \
-    --enable-rexec --enable-rexecd \
-    --enable-rcp --enable-hostname \
-    --disable-tftp --disable-tftpd \
-    --disable-ping --disable-ping6 \
-    --disable-logger --disable-syslogd \
-    --disable-inetd --disable-whois \
-    --disable-uucpd --disable-ifconfig --disable-traceroute
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/bin"
-  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
-  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
-  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
-  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
-  install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
-  install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
-  install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
-  install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
-  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
-}
diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname
deleted file mode 100644
index 4bba209fe..000000000
--- a/testing/inetutils/dnsdomainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -y "$@"
diff --git a/testing/inetutils/domainname b/testing/inetutils/domainname
deleted file mode 100644
index a1b8a8c31..000000000
--- a/testing/inetutils/domainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -d "$@"
diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf
deleted file mode 100644
index f660f0035..000000000
--- a/testing/inetutils/ftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ftpd
-#
-FTPD_ARGS=""
diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc
deleted file mode 100644
index 3d0d34421..000000000
--- a/testing/inetutils/ftpd.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ftpd
-
-PID=$(pidof -o %PPID /usr/sbin/ftpd)
-case "$1" in
-  start)
-    stat_busy "Starting ftpd"
-    [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ftpd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install
deleted file mode 100644
index b338fa498..000000000
--- a/testing/inetutils/inetutils.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(inetutils.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/inetutils/rexec.xinetd b/testing/inetutils/rexec.xinetd
deleted file mode 100644
index 4659e4745..000000000
--- a/testing/inetutils/rexec.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service exec
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rexecd
-        log_on_failure          += USERID
-        disable                 = yes
-}
diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd
deleted file mode 100644
index 5c72f86df..000000000
--- a/testing/inetutils/rlogin.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service login
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rlogind
-        log_on_failure          += USERID
-        disable                 = yes
-}
diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd
deleted file mode 100644
index a13738c31..000000000
--- a/testing/inetutils/rsh.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service shell
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rshd
-        log_on_failure          += USERID
-        disable                 = yes
-}
diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd
deleted file mode 100644
index 6abef359c..000000000
--- a/testing/inetutils/talk.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ntalk
-{
-	flags			= REUSE
-	socket_type		= dgram
-	wait			= yes
-	user			= root
-	server			= /usr/sbin/talkd
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd
deleted file mode 100644
index bd3a5e4b1..000000000
--- a/testing/inetutils/telnet.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service telnet
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/telnetd
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
deleted file mode 100644
index 1295549c3..000000000
--- a/testing/iproute2/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 147098 2012-01-21 22:46:26Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=iproute2
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('glibc' 'db')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
-	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
-	iproute2-fhs.patch
-        fix-ip-l.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-          '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # set correct fhs structure
-  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
-
-  #upstream fixes
-  patch -Np1 -i "$srcdir/fix-ip-l.patch"
-
-  ./configure
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # allow loopback to be started before /usr is mounted, this may not be supported in the future
-  mkdir -p "$pkgdir/sbin"
-  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
-  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
-  # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
-  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
-}
diff --git a/testing/iproute2/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/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch
deleted file mode 100644
index 2608414db..000000000
--- a/testing/iproute2/iproute2-fhs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
---- iproute2.old/Makefile	2009-11-11 22:05:21.251407668 +0100
-+++ iproute2-2.6.29/Makefile	2009-11-11 22:07:09.891833516 +0100
-@@ -1,11 +1,12 @@
- DESTDIR=/usr/
- ROOTDIR=$(DESTDIR)
- LIBDIR=/usr/lib/
--SBINDIR=/sbin
-+SBINDIR=/usr/sbin
- CONFDIR=/etc/iproute2
--DOCDIR=/share/doc/iproute2
--MANDIR=/share/man
-+DOCDIR=/usr/share/doc/iproute2
-+MANDIR=/usr/share/man
- ARPDDIR=/var/lib/arpd
-+SHAREDIR=/usr/share
-
- # Path to db_185.h include
- DBM_INCLUDE:=$(ROOTDIR)/usr/include
-diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
---- iproute2.old/tc/tc_util.c	2009-11-11 22:05:21.298076943 +0100
-+++ iproute2-2.6.29/tc/tc_util.c	2009-11-11 22:09:32.865152646 +0100
-@@ -24,8 +24,8 @@
- #include "utils.h"
- #include "tc_util.h"
- 
--#ifndef LIBDIR
--#define LIBDIR "/usr/lib/"
-+#ifndef SHAREDIR
-+#define SHAREDIR "/usr/share"
- #endif
- 
- const char *get_tc_lib(void)
-@@ -34,7 +34,7 @@
- 
- 	lib_dir = getenv("TC_LIB_DIR");
- 	if (!lib_dir)
--		lib_dir = LIBDIR "/tc/";
-+		lib_dir = SHAREDIR "/tc/";
- 
- 	return lib_dir;
- }
-diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
---- iproute2.old/netem/Makefile	2010-08-06 11:30:48.640940183 +0200
-+++ iproute2-2.6.35/netem/Makefile	2010-08-06 11:32:34.210908892 +0200
-@@ -20,9 +20,9 @@
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
- 
- install: all
--	mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
- 	for i in $(DISTDATA); \
--	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
---- iproute2.old/tc/Makefile	2010-08-06 11:48:35.607472252 +0200
-+++ iproute2-2.6.35/tc/Makefile	2010-08-06 11:49:36.977473380 +0200
-@@ -99,18 +99,11 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(MODDESTDIR)
--	install -m 0755 tc $(DESTDIR)$(SBINDIR)
--	for i in $(TCSO); \
--	do install -m 755 $$i $(MODDESTDIR); \
--	done
--	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
--	if [ -f $(MODDESTDIR)/m_xt.so ]; \
--		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
--	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
--		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
--	fi; \
--	fi
-+	mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+	install -m 0755 tc $(DESTDIR)$(SBINDIR)
-+	for i in $(TCSO); \
-+	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+	done
- 
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
deleted file mode 100644
index 4a0d3c815..000000000
--- a/testing/iptables/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 147991 2012-01-29 12:47:57Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iptables
-pkgver=1.4.12.2
-pkgrel=1
-pkgdesc='Linux kernel packet control tool'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://www.netfilter.org/projects/iptables/index.html'
-depends=('glibc' 'bash')
-makedepends=('linux-api-headers')
-options=('!libtool')
-source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
-        iptables
-        ip6tables
-        empty.rules
-        simple_firewall.rules
-        iptables.conf.d
-        empty-filter.rules
-        empty-mangle.rules
-        empty-nat.rules
-        empty-raw.rules
-        empty-security.rules)
-backup=(etc/conf.d/iptables)
-sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c'
-          '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
-          '2db68906b603e5268736f48c8e251f3a49da1d75'
-          '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
-          '9907f9e815592837abc7fa3264a401567b7606ab'
-          'cdb830137192bbe002c6d01058656bd053ed0ddd'
-          'd9f9f06b46b4187648e860afa0552335aafe3ce4'
-          'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
-          '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
-          '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
-          'ebbd1424a1564fd45f455a81c61ce348f0a14c2e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://bugs.archlinux.org/task/17046
-  sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in
-  sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
-
- # FS#25358: libxt_statistic.so undefined symbol: lround 
- export LDFLAGS='-lm'
-
- ./configure --prefix=/usr \
-     --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
-     --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel --enable-libipq \
-     --enable-shared --enable-static 
-# build fails when not enabling static, see if we can remove it on next build
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  unset CFLAGS
-  unset LDFLAGS
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"
-  install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
-  install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
-  install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
-  install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
-  install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
-
-  mkdir -p "${pkgdir}"/var/lib/iptables
-  install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
-}
diff --git a/testing/iptables/empty-filter.rules b/testing/iptables/empty-filter.rules
deleted file mode 100644
index 5a4de4876..000000000
--- a/testing/iptables/empty-filter.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables filter table rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-mangle.rules b/testing/iptables/empty-mangle.rules
deleted file mode 100644
index 49d493c4d..000000000
--- a/testing/iptables/empty-mangle.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# Empty iptables mangle table rules file
-*mangle
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-nat.rules b/testing/iptables/empty-nat.rules
deleted file mode 100644
index 437e96411..000000000
--- a/testing/iptables/empty-nat.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Empty iptables nat table rules file
-*nat
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-raw.rules b/testing/iptables/empty-raw.rules
deleted file mode 100644
index 8dc50d23e..000000000
--- a/testing/iptables/empty-raw.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Empty iptables raw table rules file
-*raw
-:PREROUTING ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-security.rules b/testing/iptables/empty-security.rules
deleted file mode 100644
index 4531fa13f..000000000
--- a/testing/iptables/empty-security.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables security table rules file
-*security
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty.rules b/testing/iptables/empty.rules
deleted file mode 100644
index e24e1aa30..000000000
--- a/testing/iptables/empty.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/testing/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IP6TABLES_CONF" ]; then
-			echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP6 Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
-			echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
-		fi
-		if ck_daemon ip6tables; then
-			/usr/sbin/ip6tables-restore < $IP6TABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP6 Tables"
-		if ! ck_daemon ip6tables; then
-			fail=0
-			for table in $(cat /proc/net/ip6_tables_names); do
-				ip6tables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP6 Tables"
-		/usr/sbin/ip6tables-save >$IP6TABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables b/testing/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/testing/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IPTABLES_CONF" ]; then
-			echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv4/ip_forward
-		fi
-		if ck_daemon iptables; then
-			/usr/sbin/iptables-restore < $IPTABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP Tables"
-		if ! ck_daemon iptables; then
-			fail=0
-			for table in $(cat /proc/net/ip_tables_names); do
-				iptables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP Tables"
-		/usr/sbin/iptables-save >$IPTABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/testing/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules
deleted file mode 100644
index e1604cc36..000000000
--- a/testing/iptables/simple_firewall.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -p icmp -j ACCEPT 
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT 
--A INPUT -i lo -j ACCEPT 
--A INPUT -p tcp -j REJECT --reject-with tcp-reset 
--A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable 
--A INPUT -j REJECT --reject-with icmp-proto-unreachable 
-COMMIT
diff --git a/testing/k9copy/PKGBUILD b/testing/k9copy/PKGBUILD
deleted file mode 100644
index e4ca2bf0b..000000000
--- a/testing/k9copy/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146245 2012-01-07 05:13:20Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
-
-pkgname=k9copy
-pkgver=2.3.8
-pkgrel=2
-pkgdesc="A small utility which allows the copy of DVD under Linux"
-arch=('i686' 'x86_64')
-url="http://k9copy.sourceforge.net"
-license=('GPL')
-depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor')
-makedepends=('automoc4' 'cmake')
-install=k9copy.install
-source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz")
-md5sums=('584f6cc50f28befbeb0d5c1ec9476456')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-Source"
-
-  sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-Source"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/k9copy/k9copy.install b/testing/k9copy/k9copy.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/k9copy/k9copy.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kactivities/PKGBUILD b/testing/kactivities/PKGBUILD
deleted file mode 100644
index 65f6d7003..000000000
--- a/testing/kactivities/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 147575 2012-01-25 23:15:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kactivities
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='API for using and interacting with Activities'
-url='http://kde.org/'
-license=('GPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ac64d13f767c06bfcf2040fcdf94a78410ad035d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kaffeine/PKGBUILD b/testing/kaffeine/PKGBUILD
deleted file mode 100644
index 0cd53aea7..000000000
--- a/testing/kaffeine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146247 2012-01-07 05:13:23Z eric $
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kaffeine
-pkgver=1.2.2
-pkgrel=2
-pkgdesc='KDE media player'
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://kaffeine.kde.org"
-depends=('kdelibs' 'kdebase-runtime' 'xine-lib')
-makedepends=('pkg-config' 'cmake' 'automoc4')
-install=kaffeine.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
-
-build() {
-	cd "$srcdir"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-        cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-}
diff --git a/testing/kaffeine/kaffeine.install b/testing/kaffeine/kaffeine.install
deleted file mode 100644
index 5c501dc49..000000000
--- a/testing/kaffeine/kaffeine.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/kdeaccessibility-jovie/PKGBUILD b/testing/kdeaccessibility-jovie/PKGBUILD
deleted file mode 100644
index 7dda45235..000000000
--- a/testing/kdeaccessibility-jovie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147585 2012-01-25 23:21:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-jovie
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='A text to speech application'
-url='http://kde.org/applications/utilities/jovie/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-replaces=('kdeaccessibility-kttsd')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.bz2")
-sha1sums=('aef47e440183323c5a62d3f45aaece7215817917')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../jovie-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeaccessibility-kaccessible/PKGBUILD b/testing/kdeaccessibility-kaccessible/PKGBUILD
deleted file mode 100644
index 178a4b15a..000000000
--- a/testing/kdeaccessibility-kaccessible/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147586 2012-01-25 23:22:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kaccessible
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-url='http://accessibility.kde.org/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdelibs' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2")
-sha1sums=('16451b090fe1ed345b5c1d3426bf0123eda08859')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kaccessible-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmag/PKGBUILD b/testing/kdeaccessibility-kmag/PKGBUILD
deleted file mode 100644
index 67ef40dd2..000000000
--- a/testing/kdeaccessibility-kmag/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147587 2012-01-25 23:22:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmag
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Screen Magnifier'
-url='http://kde.org/applications/utilities/kmag/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.bz2")
-sha1sums=('7f281e2ac07aeb8d31249e6e0b27661a87f98a0c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmag-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeaccessibility-kmousetool/PKGBUILD b/testing/kdeaccessibility-kmousetool/PKGBUILD
deleted file mode 100644
index fbdaf0720..000000000
--- a/testing/kdeaccessibility-kmousetool/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147588 2012-01-25 23:23:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmousetool
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-url='http://kde.org/applications/utilities/kmousetool/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2")
-sha1sums=('121fce8fd61772d044a48885918d2c0b500bb646')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmousetool-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeaccessibility-kmouth/PKGBUILD b/testing/kdeaccessibility-kmouth/PKGBUILD
deleted file mode 100644
index 09a838a85..000000000
--- a/testing/kdeaccessibility-kmouth/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147589 2012-01-25 23:23:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmouth
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Speech Synthesizer Frontend'
-url='http://kde.org/applications/utilities/kmouth/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.bz2")
-sha1sums=('43ff583d0628005087c948362b1e64dc4d359d88')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmouth-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeadmin/PKGBUILD b/testing/kdeadmin/PKGBUILD
deleted file mode 100644
index 12d154e47..000000000
--- a/testing/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 147590 2012-01-25 23:24:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser'
-         'kdeadmin-system-config-printer-kde')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'syslog-path.patch')
-sha1sums=('a7cf29130bd83615bdc01f54a465cef8c492c527'
-          '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	patch -p1 -i ${srcdir}/syslog-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_strigi-analyzer=OFF \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-	depends=('kdelibs')
-	cd $srcdir/build/kcron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-	pkgdesc='System log viewer tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/ksystemlog/"
-	cd $srcdir/build/ksystemlog
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksystemlog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-	pkgdesc='User Manager'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/system/kuser/"
-	install='kdeadmin.install'
-	cd $srcdir/build/kuser
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kuser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
-	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt'
-             'cups' 'python2-gobject2')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-
-        # Use the python2 executable
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-          "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
-        sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-          "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
-}
diff --git a/testing/kdeadmin/kdeadmin.install b/testing/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeadmin/syslog-path.patch b/testing/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/testing/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/testing/kdeartwork/PKGBUILD b/testing/kdeartwork/PKGBUILD
deleted file mode 100644
index 3c85469db..000000000
--- a/testing/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 147591 2012-01-25 23:25:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
-         'kdeartwork-colorschemes'
-         'kdeartwork-desktopthemes'
-         'kdeartwork-emoticons'
-         'kdeartwork-iconthemes'
-         'kdeartwork-kscreensaver'
-         'kdeartwork-sounds'
-         'kdeartwork-styles'
-         'kdeartwork-wallpapers'
-         'kdeartwork-weatherwallpapers')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
-             'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('08c6e127ad1931a13ea1dde25189a49de089fa89')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeartwork-aurorae() {
-	pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
-	cd $srcdir/build/aurorae
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
-	pkgdesc='KDE color schemes'
-    replaces=('kdeaccessibility-colorschemes')
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
-	pkgdesc='KDE desktop themes'
-	cd $srcdir/build/desktopthemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
-	pkgdesc='KDE emoticons'
-	cd $srcdir/build/emoticons
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
-	pkgdesc='KDE icon themes'
-    replaces=('kdeaccessibility-iconthemes')
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
-	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/kscreensaver
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
-	pkgdesc='KDE sounds'
-	cd $srcdir/build/sounds
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
-	pkgdesc='KDE styles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/styles
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwin-styles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
-	pkgdesc='KDE wallpapers'
-	cd $srcdir/build/wallpapers
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/HighResolutionWallpapers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
-	pkgdesc='KDE weather wallpapers'
-	cd $srcdir/build/WeatherWallpapers
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdebase-konsole/PKGBUILD b/testing/kdebase-konsole/PKGBUILD
deleted file mode 100644
index bd62084fe..000000000
--- a/testing/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147592 2012-01-25 23:29:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://kde.org/applications/system/konsole/'
-pkgdesc="Terminal"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('f99abc20fd0042be62e48308f334b66a6a3135d7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../konsole-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebase-runtime/PKGBUILD b/testing/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 0a4d591f0..000000000
--- a/testing/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 147564 2012-01-25 23:09:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'xine-lib')
-optdepends=('htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
-sha1sums=('5e1e98535529a67f8d20e8c76d051c81604d7064')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-
-    # Fix Python2 path
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
diff --git a/testing/kdebase-runtime/kdebase-runtime.install b/testing/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/testing/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdebase-runtime/libqzeitgeist08.patch b/testing/kdebase-runtime/libqzeitgeist08.patch
deleted file mode 100644
index f832cd8b2..000000000
--- a/testing/kdebase-runtime/libqzeitgeist08.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~	2011-10-29 15:46:55.003710230 +0000
-+++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt	2011-10-29 15:47:28.910716093 +0000
-@@ -21,7 +21,7 @@
-     )
- endif(Nepomuk_FOUND)
- 
--# Checking for QtZeitgeist
-+# Checking for QZeitgeist
- macro_optional_find_package(QZeitgeist)
- 
- if (QZEITGEIST_INCLUDE_DIR)
-@@ -30,8 +30,8 @@
- 
- macro_log_feature(
-         QZeitgeist_FOUND
--        "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
--        "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking")
-+        "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
-+        "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking")
- if (QZeitgeist_FOUND)
-     set(HAVE_QZEITGEIST 1)
-     include_directories(${QZEITGEIST_INCLUDE_DIR})
---- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~	2011-10-29 15:47:40.960836591 +0000
-+++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp	2011-10-29 15:48:57.034930073 +0000
-@@ -21,31 +21,31 @@
- 
- #ifndef HAVE_QZEITGEIST
- #ifdef __GNUC__
--    #warning "No QtZeitgeist, disabling desktop events processing"
-+    #warning "No QZeitgeist, disabling desktop events processing"
- #endif
- 
- #else // HAVE_QZEITGEIST
- 
- #include "ZeitgeistEventBackend.h"
- 
--#include <QtZeitgeist/QtZeitgeist>
--#include <QtZeitgeist/Interpretation>
--#include <QtZeitgeist/Manifestation>
-+#include <QZeitgeist/QZeitgeist>
-+#include <QZeitgeist/Interpretation>
-+#include <QZeitgeist/Manifestation>
- 
- static QString eventInterpretation(Event::Type type)
- {
-     switch (type) {
-         case Event::Accessed:
--            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
- 
-         case Event::Opened:
--            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
- 
-         case Event::Modified:
--            return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
-+            return QZeitgeist::Interpretation::Event::ZGModifyEvent;
- 
-         case Event::Closed:
--            return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
-+            return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
- 
-     }
- 
-@@ -57,23 +57,23 @@
- {
-     switch (reason) {
-         case Event::User:
--            return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+            return QZeitgeist::Manifestation::Event::ZGUserActivity;
- 
-         case Event::Heuristic:
--            return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
-+            return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
- 
-         case Event::Scheduled:
--            return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
-+            return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
- 
-         case Event::System:
--            return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
-+            return QZeitgeist::Manifestation::Event::ZGSystemNotification;
- 
-         case Event::World:
--            return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
-+            return QZeitgeist::Manifestation::Event::ZGWorldActivity;
-     }
- 
-     // shut up GCC
--    return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+    return QZeitgeist::Manifestation::Event::ZGUserActivity;
- }
- 
- static QString applicationUri(const QString & application)
-@@ -84,7 +84,6 @@
- 
- ZeitgeistEventBackend::ZeitgeistEventBackend()
- {
--    QtZeitgeist::init();
- }
- 
- void ZeitgeistEventBackend::addEvents(const EventList & events)
diff --git a/testing/kdebase/PKGBUILD b/testing/kdebase/PKGBUILD
deleted file mode 100644
index e49b92dce..000000000
--- a/testing/kdebase/PKGBUILD
+++ /dev/null
@@ -1,125 +0,0 @@
-# $Id: PKGBUILD 147577 2012-01-25 23:17:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konq-plugins'
-         'kdebase-konqueror'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
-        'fix-controlclick-selection.patch')
-sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
-          'b29c42301b84475f95f19ff9edb22d2134df9c1c')
-
-build() {
-    cd "${srcdir}"/kde-baseapps-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-controlclick-selection.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../kde-baseapps-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdebase-dolphin() {
-	pkgdesc='File Manager'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
-                'kdegraphics-thumbnailers: thumbnailers for graphics file'
-                'ruby: servicemenu installation')
-	url="http://kde.org/applications/system/dolphin/"
-        install=kdebase-dolphin.install
-	cd $srcdir/build/dolphin
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dolphin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
-	pkgdesc='Change Password'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	cd $srcdir/build/kdepasswd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdepasswd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
-	pkgdesc='A utility for displaying dialog boxes from shell scripts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kdialog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
-	pkgdesc='Bookmark Organizer and Editor'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
-	pkgdesc='Find Files/Folders'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kfind/"
-	install='kdebase.install'
-	cd $srcdir/build/kfind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konq-plugins() {
-	pkgdesc='Extra plugins for Konqueror'
-	depends=('kdebase-konqueror' 'tidyhtml')
-	replaces=('konq-plugins')
-	install='kdebase.install'
-	cd $srcdir/build/konq-plugins
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
-	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-	optdepends=('kwebkitpart: to enable webkit engine')
-	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase-konqueror.install'
-        conflicts=('kdebase-nsplugins')
-        replaces=('kdebase-nsplugins')
-        for i in konqueror doc/konqueror nsplugins; do
-              cd $srcdir/build/${i}
-              make DESTDIR=$pkgdir install
-        done
-}
-
-package_kdebase-lib() {
-	pkgdesc='KDE libraries for the basic desktop applications'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/lib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
-	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
-	cd $srcdir/build/plasma
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdebase/fix-controlclick-selection.patch b/testing/kdebase/fix-controlclick-selection.patch
deleted file mode 100644
index a51161326..000000000
--- a/testing/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/testing/kdebase/kdebase-dolphin.install b/testing/kdebase/kdebase-dolphin.install
deleted file mode 100644
index 660593cf5..000000000
--- a/testing/kdebase/kdebase-dolphin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdebase/kdebase-konqueror.install b/testing/kdebase/kdebase-konqueror.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdebase/kdebase-konqueror.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdebase/kdebase.install b/testing/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdebindings-kimono/PKGBUILD b/testing/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 89affca1b..000000000
--- a/testing/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147593 2012-01-25 23:29:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.8.0
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qyoto' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('b46842ce2b3c1aa3620277a461c3d127843d6a4d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kimono-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-kross/PKGBUILD b/testing/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 957c4d5ca..000000000
--- a/testing/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 147594 2012-01-25 23:30:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.8.0
-pkgrel=1
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
-source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('2b2ac36b1597e180c1e3923c00f4ca465bd99a03')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kross-interpreters-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_ruby=OFF \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-kross-python() {
-  pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'python2')
-
-  cd "${srcdir}"/build/python
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-java() {
-  pkgdesc="Java language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'java-environment')
-
-  cd "${srcdir}"/build/java
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-ruby() {
-  pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'ruby')
-
-  cd "${srcdir}"/build/ruby
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-perlkde/PKGBUILD b/testing/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index d28d90146..000000000
--- a/testing/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147595 2012-01-25 23:30:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
-            'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('e9c46cec78f42a29befbc26dfa428d6a28027754')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlkde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-perlqt/PKGBUILD b/testing/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index 35597454b..000000000
--- a/testing/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147571 2012-01-25 23:13:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'perl-list-moreutils')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('db11f9625d6c531d9b4cf0d50c36e405600a7717')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD
deleted file mode 100644
index a95919dcd..000000000
--- a/testing/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147572 2012-01-25 23:13:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-python
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/testing/kdebindings-qtruby/PKGBUILD b/testing/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index e704314ac..000000000
--- a/testing/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147574 2012-01-25 23:14:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Qt bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'ruby')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('9b8e9ab4926929909861f6557dea908d328a1dd2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-qyoto/PKGBUILD b/testing/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index 2d09d02eb..000000000
--- a/testing/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147573 2012-01-25 23:14:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.8.0
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'mono')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('3e5abc08b5a097e332449f15c50975402934d60a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qyoto-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-smokegen/PKGBUILD b/testing/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index 23a6998d0..000000000
--- a/testing/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147566 2012-01-25 23:10:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
-sha1sums=('9b4f0af954e845eecea8e7ed388e01cffb8974d2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokegen-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-smokekde/PKGBUILD b/testing/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index d779b8ded..000000000
--- a/testing/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147570 2012-01-25 23:12:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('04f01d14cfc395fcf675b7a22202b41351f471f9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokekde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-smokeqt/PKGBUILD b/testing/kdebindings-smokeqt/PKGBUILD
deleted file mode 100644
index 797647835..000000000
--- a/testing/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147567 2012-01-25 23:10:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('9ad56f1441c92b6d24b7e9ec19fe62da34820731')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokeqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Qwt5=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-analitza/PKGBUILD b/testing/kdeedu-analitza/PKGBUILD
deleted file mode 100644
index 5b7311cd5..000000000
--- a/testing/kdeedu-analitza/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147584 2012-01-25 23:21:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-analitza
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A library to add mathematical features to your program"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.bz2")
-sha1sums=('2681b114deab6f3fd215e0348e34c63116ddd31c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../analitza-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-blinken/PKGBUILD b/testing/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index 157c841ad..000000000
--- a/testing/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147596 2012-01-25 23:31:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Memory Enhancement Game"
-url="http://kde.org/applications/education/blinken/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('7283a49de949e15f9c9ab06dfa133012a4090a7c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../blinken-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-blinken/kdeedu-blinken.install b/testing/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-blinken/kdeedu-blinken.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-cantor/PKGBUILD b/testing/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index c0e77dd68..000000000
--- a/testing/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147597 2012-01-25 23:31:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
-            'octave: Octave backend'
-            'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('b0ef9cb3c25e4909b6855317425e9d9f12697dff')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../cantor-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-cantor/kdeedu-cantor.install b/testing/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-cantor/kdeedu-cantor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kalgebra/PKGBUILD b/testing/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index 63e37479c..000000000
--- a/testing/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147598 2012-01-25 23:32:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Graph Calculator"
-url="http://kde.org/applications/education/kalgebra/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('45903803c0c0f3e05c30e7543ee3ebc891b60e4b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalgebra-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kalgebra/kdeedu-kalgebra.install b/testing/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kalgebra/kdeedu-kalgebra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kalzium/PKGBUILD b/testing/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index ac5a24ea8..000000000
--- a/testing/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147599 2012-01-25 23:32:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('0d4f9d3a148052c93068d4c2c0ed22969ac05202')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalzium-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kalzium/kdeedu-kalzium.install b/testing/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kalzium/kdeedu-kalzium.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kanagram/PKGBUILD b/testing/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index 695ca5e8b..000000000
--- a/testing/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147600 2012-01-25 23:33:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Letter Order Game"
-url="http://kde.org/applications/education/kanagram/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('85daff6309edf72f93fe0f692413216313c98dbd')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kanagram-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kanagram/kdeedu-kanagram.install b/testing/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kanagram/kdeedu-kanagram.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kbruch/PKGBUILD b/testing/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index 2c8e2e227..000000000
--- a/testing/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147601 2012-01-25 23:33:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Exercise Fractions"
-url="http://kde.org/applications/education/kbruch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('0f602d0dd1355dbf84c26f813458bdeb0508f4f8')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kbruch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kbruch/kdeedu-kbruch.install b/testing/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kbruch/kdeedu-kbruch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kgeography/PKGBUILD b/testing/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index 3d5efab4d..000000000
--- a/testing/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147602 2012-01-25 23:34:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Geography Trainer"
-url="http://kde.org/applications/education/kgeography/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('07d77cd5182e0594273aa713ad62134232868c08')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgeography-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kgeography/kdeedu-kgeography.install b/testing/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kgeography/kdeedu-kgeography.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-khangman/PKGBUILD b/testing/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index 1d33727e0..000000000
--- a/testing/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147603 2012-01-25 23:35:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Hangman Game"
-url="http://kde.org/applications/education/khangman/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('2deaab70f8ed414a4ddb21aeb91627dac74986a6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../khangman-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-khangman/kdeedu-khangman.install b/testing/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-khangman/kdeedu-khangman.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD
deleted file mode 100644
index d99d9dec7..000000000
--- a/testing/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147604 2012-01-25 23:35:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('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-kiten/PKGBUILD b/testing/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index f7e20eeb8..000000000
--- a/testing/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147605 2012-01-25 23:36:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Japanese Reference/Study Tool"
-url="http://kde.org/applications/education/kiten/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('4068f2bcca69150a9b340a6d47ec4902d9dbacc9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kiten-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kiten/kdeedu-kiten.install b/testing/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kiten/kdeedu-kiten.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-klettres/PKGBUILD b/testing/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index 5f58ccf94..000000000
--- a/testing/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147606 2012-01-25 23:36:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Learn The Alphabet"
-url="http://kde.org/applications/education/klettres/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('9d2c13dd14db79451db8afdc184f264b1ba29d81')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../klettres-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-klettres/kdeedu-klettres.install b/testing/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-klettres/kdeedu-klettres.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kmplot/PKGBUILD b/testing/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index 24270fc4d..000000000
--- a/testing/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147607 2012-01-25 23:37:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('914151c41fba93cb1d0cd659fb3e392c0de1b5f8')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmplot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kmplot/kdeedu-kmplot.install b/testing/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kmplot/kdeedu-kmplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kstars/PKGBUILD b/testing/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index f47971e89..000000000
--- a/testing/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147608 2012-01-25 23:37:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('249f80cdd5198c5c22ce75cea4d1718d5865a3c9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kstars/kdeedu-kstars.install b/testing/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kstars/kdeedu-kstars.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-ktouch/PKGBUILD b/testing/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index 20b5dbbbf..000000000
--- a/testing/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147609 2012-01-25 23:38:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('e1e1338e67c0c02c4573a4aa95a721c8f674f2c6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktouch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-ktouch/kdeedu-ktouch.install b/testing/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-ktouch/kdeedu-ktouch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kturtle/PKGBUILD b/testing/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index a2569a0b8..000000000
--- a/testing/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147610 2012-01-25 23:39:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Educational Programming Environment"
-url="http://kde.org/applications/education/kturtle/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('3da036991fed5840fb45d033efe0082570e804d9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kturtle-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kturtle/kdeedu-kturtle.install b/testing/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kturtle/kdeedu-kturtle.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kwordquiz/PKGBUILD b/testing/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index 3ae7b51e0..000000000
--- a/testing/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147611 2012-01-25 23:39:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Flash Card Trainer"
-url="http://kde.org/applications/education/kwordquiz/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('34eec78fe68aef8b7166ca6cca84ed58290484b9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwordquiz-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-marble/PKGBUILD b/testing/kdeedu-marble/PKGBUILD
deleted file mode 100644
index 4a6f53e5e..000000000
--- a/testing/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147579 2012-01-25 23:18:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2")
-sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../marble-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-marble/kdeedu-marble.install b/testing/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-marble/kdeedu-marble.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-parley/PKGBUILD b/testing/kdeedu-parley/PKGBUILD
deleted file mode 100644
index 0d68cc678..000000000
--- a/testing/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147612 2012-01-25 23:40:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Vocabulary Trainer"
-url="http://kde.org/applications/education/parley/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('800eea4d6339da608cc720b5d6186de9a43b70ce')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../parley-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-parley/kdeedu-parley.install b/testing/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-parley/kdeedu-parley.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index c43b9d002..000000000
--- a/testing/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147613 2012-01-25 23:40:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('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/kdeedu-step/PKGBUILD b/testing/kdeedu-step/PKGBUILD
deleted file mode 100644
index c33f01d37..000000000
--- a/testing/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147614 2012-01-25 23:41:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Interactive Physical Simulator"
-url="http://kde.org/applications/education/step/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('08fff354effdc6f10e3b55ab011f8393a19de9fd')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../step-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-step/kdeedu-step.install b/testing/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-step/kdeedu-step.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegames/PKGBUILD b/testing/kdegames/PKGBUILD
deleted file mode 100644
index d9e46478b..000000000
--- a/testing/kdegames/PKGBUILD
+++ /dev/null
@@ -1,516 +0,0 @@
-# $Id: PKGBUILD 147615 2012-01-25 23:42:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
-         'kdegames-bovo'
-         'kdegames-granatier'
-         'kdegames-kajongg'
-         'kdegames-kapman'
-         'kdegames-katomic'
-         'kdegames-kbattleship'
-         'kdegames-kblackbox'
-         'kdegames-kblocks'
-         'kdegames-kbounce'
-         'kdegames-kbreakout'
-         'kdegames-kdiamond'
-         'kdegames-kfourinline'
-         'kdegames-kgoldrunner'
-         'kdegames-kigo'
-         'kdegames-killbots'
-         'kdegames-kiriki'
-         'kdegames-kjumpingcube'
-         'kdegames-klines'
-         'kdegames-klickety'
-         'kdegames-kmahjongg'
-         'kdegames-kmines'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktron'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python'
-             'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('714a775811dae11ca85ce1113d673894b0afdcdd')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdegames-bomber() {
-	pkgdesc='Arcade Bombing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bomber/"
-	install='kdegames.install'
-	cd $srcdir/build/bomber
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bomber
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
-	pkgdesc='Five-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bovo/"
-	install='kdegames.install'
-	cd $srcdir/build/bovo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bovo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
-	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/granatier/"
-	install='kdegames.install'
-	cd $srcdir/build/granatier
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
-        url="http://www.kde.org/applications/games/kajongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kajongg
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
-	pkgdesc='Eat pills escaping ghosts'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kapman/"
-	install='kdegames.install'
-	cd $srcdir/build/kapman
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
-	pkgdesc='Sokoban-like Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/katomic/"
-	install='kdegames.install'
-	cd $srcdir/build/katomic
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
-	pkgdesc='Battleship Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kbattleship/"
-	install='kdegames-kbattleship.install'
-	cd $srcdir/build/kbattleship
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbattleship
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
-		$pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
-	pkgdesc='Blackbox Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblackbox/"
-	install='kdegames.install'
-	cd $srcdir/build/kblackbox
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblackbox
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
-	pkgdesc='Falling Blocks Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblocks/"
-	install='kdegames.install'
-	cd $srcdir/build/kblocks
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblocks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
-	pkgdesc='Ball Bouncing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbounce/"
-	install='kdegames.install'
-	cd $srcdir/build/kbounce
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbounce
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
-	pkgdesc='Breakout-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbreakout/"
-	install='kdegames.install'
-	cd $srcdir/build/kbreakout
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbreakout
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
-	pkgdesc='Three-in-a-row game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kdiamond/"
-	install='kdegames.install'
-	cd $srcdir/build/kdiamond
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdiamond
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
-	pkgdesc='Four-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames-kfourinline.install'
-	cd $srcdir/build/kfourinline
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfourinline
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
-	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/kgoldrunner/"
-	install='kdegames.install'
-	cd $srcdir/build/kgoldrunner
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgoldrunner
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
-	pkgdesc='Go Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
-	url="http://kde.org/applications/games/kigo/"
-	install='kdegames-kigo.install'
-	cd $srcdir/build/kigo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kigo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
-	pkgdesc='Killbots'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/killbots/"
-	install='kdegames.install'
-	cd $srcdir/build/killbots
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/killbots
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
-	pkgdesc='Yahtzee-like Dice Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kiriki/"
-	install='kdegames.install'
-	cd $srcdir/build/kiriki
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiriki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
-	pkgdesc='Territory Capture Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kjumpingcube/"
-	install='kdegames.install'
-	cd $srcdir/build/kjumpingcube
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kjumpingcube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
-	pkgdesc='Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	replaces=('kdegames-ksame')
-	conflicts=('kdegames-ksame')
-	url="http://kde.org/applications/games/ksame/"
-	install='kdegames.install'
-	cd $srcdir/build/klickety
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klickety
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
-	pkgdesc='Tactical Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/klines/"
-	install='kdegames.install'
-	cd $srcdir/build/klines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
-	pkgdesc='Mahjongg Solitaire'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kmahjongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kmahjongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
-	pkgdesc='Minesweeper-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kmines/"
-	install='kdegames.install'
-	cd $srcdir/build/kmines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
-	pkgdesc='Network Construction Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knetwalk/"
-	install='kdegames.install'
-	cd $srcdir/build/knetwalk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/knetwalk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
-	pkgdesc='Miniature Golf'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kolf/"
-	install='kdegames-kolf.install'
-	cd $srcdir/build/kolf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kolf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
-	pkgdesc='A simple ball dodging game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kollision/"
-	install='kdegames.install'
-	cd $srcdir/build/kollision
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kollision
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
-	pkgdesc='Galactic Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/konquest/"
-	install='kdegames.install'
-	cd $srcdir/build/konquest
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/konquest
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
-	pkgdesc='Patience Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames-kpatience.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames-kreversi.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kreversi
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
-		$pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
-	pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kshisen/"
-	install='kdegames.install'
-	cd $srcdir/build/kshisen
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kshisen
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
-	pkgdesc='World Domination Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksirk/"
-	install='kdegames.install'
-	cd $srcdir/build/ksirk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksirk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
-	pkgdesc='Space Arcade Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames-kspaceduel.install'
-	cd $srcdir/build/kspaceduel
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames-ksquares.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksquares
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
-		$pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
-	pkgdesc='KSudoku, Sudoku game & more for KDE'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksudoku/"
-	install='kdegames.install'
-	cd $srcdir/build/ksudoku
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
-	pkgdesc='Tron-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktron/"
-	install='kdegames.install'
-	cd $srcdir/build/ktron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
-	pkgdesc='Picture Game for Children'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames-ktuberling.install'
-	cd $srcdir/build/ktuberling
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktuberling
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
-	pkgdesc='A 3-D game based on Rubik´s Cube'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kubrick/"
-	install='kdegames.install'
-	cd $srcdir/build/kubrick
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-	for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
-		install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
-	done
-}
-
-package_kdegames-libkmahjongg() {
-	pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
-	pkgdesc='Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/lskat/"
-	install='kdegames-lskat.install'
-	cd $srcdir/build/lskat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lskat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
-	pkgdesc='Jigsaw puzzle game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/palapeli/"
-	install='kdegames-palapeli.install'
-	cd $srcdir/build/palapeli
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdegames/kdegames-kbattleship.install b/testing/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/testing/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kbattleship.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/testing/kdegames/kdegames-kfourinline.install b/testing/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kigo.install b/testing/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kolf.install b/testing/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kpatience.install b/testing/kdegames/kdegames-kpatience.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kpatience.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kreversi.install b/testing/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/testing/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/kdegames/kdegames-kspaceduel.install b/testing/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-ksquares.install b/testing/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/testing/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/kdegames/kdegames-ktuberling.install b/testing/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-lskat.install b/testing/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-palapeli.install b/testing/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegames/kdegames.install b/testing/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-gwenview/PKGBUILD b/testing/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index 500a9d90a..000000000
--- a/testing/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147617 2012-01-25 23:45:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A fast and easy to use image viewer for KDE"
-url="http://kde.org/applications/graphics/gwenview/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-lib' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins: extra plugins to share photos')
-install=$pkgname.install
-source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('ea1bc5dec79fb0810fc4629e8cf023c78f12ef0b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../gwenview-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-gwenview/kdegraphics-gwenview.install b/testing/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-gwenview/kdegraphics-gwenview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-kamera/PKGBUILD b/testing/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index d04a69378..000000000
--- a/testing/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 147618 2012-01-25 23:45:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Configure Kamera"
-url="http://kde.org/applications/graphics/kamera/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'gphoto2')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('1693f435764124651d17579449aa4bfadff3701b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kamera-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kcolorchooser/PKGBUILD b/testing/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index 8fd63d7e6..000000000
--- a/testing/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147619 2012-01-25 23:45:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('84ab09ba2e0dbe8077a91d3496b6c65f54b636fc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcolorchooser-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-kgamma/PKGBUILD b/testing/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index 82b13e171..000000000
--- a/testing/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147620 2012-01-25 23:46:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A monitor calibration tool"
-url="http://kde.org/applications/graphics/kgamma/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-# note on libxxf86vm:
-#       not detected by namcap because libgl depends on it
-#       but nvidia providing libgl does not depend on libxxf86vm
-depends=('kdebase-runtime' 'libxxf86vm')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('ff86fb416475aefa69d58c3c69f5426b32ea63ae')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgamma-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kolourpaint/PKGBUILD b/testing/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index 0d1b1aa90..000000000
--- a/testing/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147621 2012-01-25 23:46:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Paint Program"
-url="http://kde.org/applications/graphics/kolourpaint/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('2d8c32fb16a8b4f479906557b5eb88c519e2c08e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kolourpaint-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-kruler/PKGBUILD b/testing/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index 4d0f721ef..000000000
--- a/testing/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147622 2012-01-25 23:47:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Screen Ruler"
-url="http://kde.org/applications/graphics/kruler/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('e453a29c327e13458c32abd86ce7b98454b859f2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kruler-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kruler/kdegraphics-kruler.install b/testing/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-kruler/kdegraphics-kruler.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-ksaneplugin/PKGBUILD b/testing/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index a13e7b916..000000000
--- a/testing/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147623 2012-01-25 23:47:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libksane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('0110854a69395bc4402caf2b91fc3cf44a4200ad')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksaneplugin-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-ksnapshot/PKGBUILD b/testing/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index e6ae19e79..000000000
--- a/testing/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147624 2012-01-25 23:48:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Screen Capture Program"
-url="http://kde.org/applications/graphics/ksnapshot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdelibs' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('a95584fd44401d130815c1ec79c21532197dbef8')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksnapshot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-mobipocket/PKGBUILD b/testing/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index a0e15ff11..000000000
--- a/testing/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147625 2012-01-25 23:48:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('86ae995f7278f14e1169335b24fe7a61069c39a2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install
deleted file mode 100644
index 660593cf5..000000000
--- a/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegraphics-svgpart/PKGBUILD b/testing/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index 623c6726b..000000000
--- a/testing/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147627 2012-01-25 23:49:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A KPart for viewving SVGs"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('bd432a31976cb64c41035382a8133332aa184c2a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../svgpart-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-thumbnailers/PKGBUILD b/testing/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index 76968f8ee..000000000
--- a/testing/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147628 2012-01-25 23:49:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkexiv2' 'libkdcraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('acaf1e7f44c3e65619ece032b9165ade65e418b5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdelibs/PKGBUILD b/testing/kdelibs/PKGBUILD
deleted file mode 100644
index 1fffc9820..000000000
--- a/testing/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 147561 2012-01-25 23:07:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
-        'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch')
-sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       # https://bugs.kde.org/show_bug.cgi?id=285028
-       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/testing/kdelibs/archlinux-menu.patch b/testing/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/testing/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/testing/kdelibs/fix-knotify-filepath.patch b/testing/kdelibs/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/testing/kdelibs/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/testing/kdelibs/kde-applications-menu.patch b/testing/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/testing/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/testing/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/testing/kdelibs/kdelibs-4.7.4-xinelib12x.patch
deleted file mode 100644
index bdcd39a6c..000000000
--- a/testing/kdelibs/kdelibs-4.7.4-xinelib12x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 5 Jan 2012 10:06:05 +0100
-Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
-
----
- cmake/modules/FindXine.cmake |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 37c58c6..d71969a 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
-   ${PC_LIBXINE_LIBRARY_DIRS}
-  )
- 
--find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
-+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
-    HINTS
-    ${PC_LIBXINE_PREFIX}/bin
- )
- 
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
--   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
-       set(XINE_VERSION_OK TRUE)
-       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
--- 
-1.7.8.2
-
diff --git a/testing/kdelibs/kdelibs.install b/testing/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD
deleted file mode 100644
index d90c2b9ab..000000000
--- a/testing/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: PKGBUILD 147629 2012-01-25 23:50:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
-             'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
-sha1sums=('210bfd435c8e6f52aa78ab46f9487a159ab2ac83'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia-dragonplayer.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dragonplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-	depends=('kdebase-runtime' 'tunepimp')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/juk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmix
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcontrol/cddbretrieval
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/testing/kdemultimedia/kdemultimedia-dragonplayer.install b/testing/kdemultimedia/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdemultimedia/kdemultimedia-dragonplayer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdemultimedia/kdemultimedia.install b/testing/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdemultimedia/mplayerthumbs.config b/testing/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/testing/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/testing/kdenetwork/PKGBUILD b/testing/kdenetwork/PKGBUILD
deleted file mode 100644
index 44bce80b7..000000000
--- a/testing/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id: PKGBUILD 147630 2012-01-25 23:51:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
-         'kdenetwork-kdnssd'
-         'kdenetwork-kget'
-         'kdenetwork-kopete'
-         'kdenetwork-kppp'
-         'kdenetwork-krdc'
-         'kdenetwork-krfb')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('51ea55dbcbece59535af61f7450e8ac2aa1db28b')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-        -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF
-	make
-}
-
-package_kdenetwork-filesharing() {
-	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
-	depends=('kdelibs' 'smbclient')
-	install='kdenetwork.install'
-	cd $srcdir/build/filesharing
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
-	pkgdesc='Monitors the network for DNS-SD services'
-	depends=('kdelibs')
-	cd $srcdir/build/kdnssd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
-	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork-kget.install'
-	cd $srcdir/build/kget
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kget
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kopete() {
-	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
-	pkgdesc='Internet Dial-Up Tool'
-	depends=('kdebase-runtime' 'ppp')
-	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork-kppp.install'
-	cd $srcdir/build/kppp
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kppp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
-	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
-    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krdc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# note on libxdamage:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdenetwork/kdenetwork-kget.install b/testing/kdenetwork/kdenetwork-kget.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdenetwork/kdenetwork-kget.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdenetwork/kdenetwork-kopete.install b/testing/kdenetwork/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdenetwork/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdenetwork/kdenetwork-kppp.install b/testing/kdenetwork/kdenetwork-kppp.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdenetwork/kdenetwork-kppp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdenetwork/kdenetwork.install b/testing/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim-runtime/PKGBUILD b/testing/kdepim-runtime/PKGBUILD
deleted file mode 100644
index 66cdc8bec..000000000
--- a/testing/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147565 2012-01-25 23:09:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1cf75a92ddd0c18891163cd9d7f2290afae17472')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdepim-runtime/kdepim-runtime.install b/testing/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/testing/kdepim-runtime/kdepim-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/kdepim/PKGBUILD b/testing/kdepim/PKGBUILD
deleted file mode 100644
index 97e382ce6..000000000
--- a/testing/kdepim/PKGBUILD
+++ /dev/null
@@ -1,244 +0,0 @@
-# $Id: PKGBUILD 147631 2012-01-25 23:52:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
-         'kdepim-akregator'
-         'kdepim-blogilo'
-         'kdepim-console'
-         'kdepim-kaddressbook'
-         'kdepim-kalarm'
-         'kdepim-kjots'
-         'kdepim-kleopatra'
-         'kdepim-kmail'
-         'kdepim-knode'
-         'kdepim-knotes'
-         'kdepim-kontact'
-         'kdepim-korganizer'
-         'kdepim-kresources'
-         'kdepim-ktimetracker'
-         'kdepim-libkdepim')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
-             'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('61509f42a96193ae2a9b9f8560dccb73d739f356')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDEPIM_BUILD_MOBILE=OFF
-	make
-}
-
-package_kdepim-akonadiconsole() {
-	pkgdesc='Akonadi Management and Debugging Console'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/akonadiconsole
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
-	pkgdesc='A Feed Reader for KDE'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/akregator/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/akregator
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
-	pkgdesc='A KDE Blogging Client'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/internet/blogilo/"
-	replaces=('blogilo')
-	conflicts=('blogilo')
-	install='kdepim.install'
-	cd "${srcdir}"/build/blogilo
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/blogilo
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
-	pkgdesc='Command line tool for accessing calendar files'
-	depends=('kdepim-runtime')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/console
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
-	pkgdesc='Contact Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kaddressbook/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
-	pkgdesc='Personal Alarm Scheduler'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kalarm/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kalarm
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kalarm
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
-	pkgdesc='Note Taker'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kjots/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kjots
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI'
-	depends=('kdepim-libkdepim')
-    install=kdepim-kleopatra.install
-	url="http://kde.org/applications/utilities/kleopatra/"
-	cd "${srcdir}"/build/kleopatra
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kleopatra
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
-	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
-	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	           'kdepim-mimelib' 'kdepim-plugins')
-	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		mailfilteragent ontologies kontact/plugins/kmail; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-knode() {
-	pkgdesc='News Reader'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/knode/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knode
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
-	pkgdesc='Popup Notes'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/knotes/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knotes
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
-	pkgdesc='Personal Information Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kontact/"
-	install='kdepim.install'
-	conflcits=('kdepim-kontactinterfaces')
-	replaces=('kdepim-kontactinterfaces')
-	for i in kontact/src doc/kontact \
-		kontact/plugins/summary kontact/plugins/specialdates; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-korganizer() {
-	pkgdesc='Calendar and Scheduling Program'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/korganizer"
-	install='kdepim-korganizer.install'
-	cd "${srcdir}"/build/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/korganizer
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kresources() {
-	pkgdesc='KDE PIM resources'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/kresources
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
-	pkgdesc='Personal Time Tracker'
-	depends=('kdepim-kresources')
-	url="http://kde.org/applications/utilities/ktimetracker/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/ktimetracker
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
-	pkgdesc='Library for KDE PIM'
-	groups=()
-	depends=('kde-agent' 'kdepim-runtime')
-	url='http://pim.kde.org'
-	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		messagecomposer messagecore messagelist messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-        plugins/ktexteditor; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
diff --git a/testing/kdepim/kdepim-kleopatra.install b/testing/kdepim/kdepim-kleopatra.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-kleopatra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim-kmail.install b/testing/kdepim/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-kmail.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim-korganizer.install b/testing/kdepim/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-korganizer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim.install b/testing/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdepim/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepimlibs/PKGBUILD b/testing/kdepimlibs/PKGBUILD
deleted file mode 100644
index 4a61dc0f8..000000000
--- a/testing/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147562 2012-01-25 23:08:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('22409015a8047e3a78711093e3363775e8434fba')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdepimlibs/kdepimlibs.install b/testing/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/testing/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/kdeplasma-addons/PKGBUILD b/testing/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index d09e62e4c..000000000
--- a/testing/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,619 +0,0 @@
-# $Id: PKGBUILD 147632 2012-01-25 23:53:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
-         'kdeplasma-addons-applets-binary-clock'
-         'kdeplasma-addons-applets-blackboard'
-         'kdeplasma-addons-applets-bookmarks'
-         'kdeplasma-addons-applets-bubblemon'
-         'kdeplasma-addons-applets-calculator'
-         'kdeplasma-addons-applets-charselect'
-         'kdeplasma-addons-applets-comic'
-         'kdeplasma-addons-applets-community'
-         'kdeplasma-addons-applets-dict'
-         'kdeplasma-addons-applets-eyes'
-         'kdeplasma-addons-applets-fifteenpuzzle'
-         'kdeplasma-addons-applets-filewatcher'
-         'kdeplasma-addons-applets-frame'
-         'kdeplasma-addons-applets-fuzzy-clock'
-         'kdeplasma-addons-applets-icontasks'
-         'kdeplasma-addons-applets-incomingmsg'
-         'kdeplasma-addons-applets-kdeobservatory'
-         'kdeplasma-addons-applets-kimpanel'
-         'kdeplasma-addons-applets-knowledgebase'
-         'kdeplasma-addons-applets-kolourpicker'
-         'kdeplasma-addons-applets-konqprofiles'
-         'kdeplasma-addons-applets-konsoleprofiles'
-         'kdeplasma-addons-applets-lancelot'
-         'kdeplasma-addons-applets-leavenote'
-         'kdeplasma-addons-applets-life'
-         'kdeplasma-addons-applets-luna'
-         'kdeplasma-addons-applets-magnifique'
-         'kdeplasma-addons-applets-mediaplayer'
-         'kdeplasma-addons-applets-microblog'
-         'kdeplasma-addons-applets-news'
-         'kdeplasma-addons-applets-notes'
-         'kdeplasma-addons-applets-nowplaying'
-         'kdeplasma-addons-applets-paste'
-         'kdeplasma-addons-applets-pastebin'
-         'kdeplasma-addons-applets-plasmaboard'
-         'kdeplasma-addons-applets-previewer'
-         'kdeplasma-addons-applets-qalculate'
-         'kdeplasma-addons-applets-rememberthemilk'
-         'kdeplasma-addons-applets-rssnow'
-         'kdeplasma-addons-applets-showdashboard'
-         'kdeplasma-addons-applets-showdesktop'
-         'kdeplasma-addons-applets-social-news'
-         'kdeplasma-addons-applets-spellcheck'
-         'kdeplasma-addons-applets-systemloadviewer'
-         'kdeplasma-addons-applets-timer'
-         'kdeplasma-addons-applets-unitconverter'
-         'kdeplasma-addons-applets-weather'
-         'kdeplasma-addons-applets-weatherstation'
-         'kdeplasma-addons-applets-webslice'
-         'kdeplasma-addons-containments'
-         'kdeplasma-addons-libs'
-         'kdeplasma-addons-runners-audioplayercontrol'
-         'kdeplasma-addons-runners-browserhistory'
-         'kdeplasma-addons-runners-characters'
-         'kdeplasma-addons-runners-contacts'
-         'kdeplasma-addons-runners-converter'
-         'kdeplasma-addons-runners-datetime'
-         'kdeplasma-addons-runners-events'
-         'kdeplasma-addons-runners-katesessions'
-         'kdeplasma-addons-runners-konquerorsessions'
-         'kdeplasma-addons-runners-konsolesessions'
-         'kdeplasma-addons-runners-kopete'
-         'kdeplasma-addons-runners-mediawiki'
-         'kdeplasma-addons-runners-spellchecker'
-         'kdeplasma-addons-wallpapers-mandelbrot'
-         'kdeplasma-addons-wallpapers-marble'
-         'kdeplasma-addons-wallpapers-pattern'
-         'kdeplasma-addons-wallpapers-potd'
-         'kdeplasma-addons-wallpapers-virus'
-         'kdeplasma-addons-wallpapers-weather')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
-             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('0049d6977cb89f303468813811f3fde2807fd8db')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeplasma-addons-applets-bball() {
-	pkgdesc='A bouncy ball for plasma'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/bball
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
-	pkgdesc='Time displayed in binary format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/binary-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
-	pkgdesc='Black Board'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/blackboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
-	pkgdesc='Quick Access to the Bookmarks'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
-	pkgdesc='A pretty bubble that monitors your system.'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bubblemon
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
-	pkgdesc='Calculate simple sums'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/calculator
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
-	pkgdesc='View, select, and copy characters from a font collection'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/charselect
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
-	pkgdesc='View comic strips from the Internet'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/comic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
-	pkgdesc='Communicate using the Social Desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/community
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
-	pkgdesc='Look up the meaning of words and their translation into different languages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/dict
-	make DESTDIR=$pkgdir install
-	# FIXME
-	# /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
-	rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
-	pkgdesc='XEyes clone'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/eyes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
-	pkgdesc='Put the pieces in order'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/fifteenPuzzle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
-	pkgdesc='Watch for changes in specified files'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fileWatcher
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
-	pkgdesc='Display your favorite pictures'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/applets/frame
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
-	pkgdesc='Time displayed in a less precise format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fuzzy-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-icontasks() {
-        pkgdesc='Switch between running applications'
-        depends=('kdebase-workspace')
-        cd $srcdir/build/applets/icontasks
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
-	pkgdesc='Notification of new messages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/incomingmsg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
-	pkgdesc='Visualize the KDE ecosystem'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/kdeobservatory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
-	pkgdesc='A generic input method panel for Oriental languages'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	optdepends=('scim: SCIM backend'
-		        'fcitx: FCITX backend'
-                'ibus: IBUS backend')
-	cd $srcdir/build/applets/kimpanel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
-	pkgdesc='Opendesktop Knowledgebase'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/knowledgebase
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
-	pkgdesc='Pick a color from the desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/kolourpicker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
-	pkgdesc='List and launch Konqueror profiles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/konsoleprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
-	pkgdesc='Launcher to start applications'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	replaces=('lancelot')
-	provides=('lancelot')
-	conflicts=('lancelot')
-	install='kdeplasma-addons-applets-lancelot.install'
-	cd $srcdir/build/applets/lancelot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
-	pkgdesc='Leave notes for users while they are away'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/leavenote
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
-	pkgdesc='Life'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/life
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
-	pkgdesc='Display moon phases for your location'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/luna
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
-	pkgdesc='A magnification glass for the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/magnifique
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
-	pkgdesc='Widget that can play video and sound'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/mediaplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
-	pkgdesc='Update and view your microblog status.'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl')
-	cd $srcdir/build/applets/microblog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
-	pkgdesc='Desktop sticky notes'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/notes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
-	pkgdesc='Displays currently playing audio'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/nowplaying
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
-	pkgdesc='Paste text snippets'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/paste
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
-	pkgdesc='Paste text/images to a remote server'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/pastebin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
-	pkgdesc='A virtual, on-screen keyboard'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/plasmaboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
-	pkgdesc='Preview This File'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/previewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
-	pkgdesc='A powerful mathematical equation solver'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/rememberthemilk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/rssnow
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
-	pkgdesc='Show the Plasma widget dashboard above other windows'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdashboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
-	pkgdesc='Show the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdesktop
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-social-news() {
-	pkgdesc='Stay informed with the Social Desktop'
-	replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/social-news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
-	pkgdesc='Fast spell checking'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/spellcheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
-	pkgdesc='Tiny CPU/RAM/Swap monitor'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/systemloadviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
-	pkgdesc='Countdown over a specified time period'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/timer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
-	pkgdesc='Plasmoid for converting units'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/unitconverter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
-	pkgdesc='Displays Weather information'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weather
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
-	pkgdesc='Weather reports with an LCD display style'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weatherstation
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
-	pkgdesc='Show a part of a webpage'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/webslice
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
-	pkgdesc='Activities types for Plasma shells'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/containments
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
-	pkgdesc='Plasma Addon Library'
-	depends=('kdebase-workspace')
-	groups=()
-	replaces=('kdeplasma-addons-dataengines')
-	provides=('kdeplasma-addons-dataengines')
-	conflicts=('kdeplasma-addons-dataengines')
-	cd $srcdir/build/libs
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dataengines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
-	pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/audioplayercontrol
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
-	pkgdesc='Searches in Konqueror´s history'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/browserhistory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
-	pkgdesc='special Characters'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/characters
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
-	pkgdesc='Finds entries in your address book'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/contacts
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
-	pkgdesc='Convert values to different units'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/converter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
-	pkgdesc='The current date and time, locally or in any timezone'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/datetime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
-	pkgdesc='Calendar Events runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/events
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
-	pkgdesc='Matches Kate Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
-	pkgdesc='Search on Wikitravel'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/mediawiki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
-	pkgdesc='Check the spelling of a word'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/spellchecker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
-	pkgdesc='Mandelbrot'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/mandelbrot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
-	pkgdesc='Globe'
-	depends=('kdebase-workspace' 'kdeedu-marble')
-	cd $srcdir/build/wallpapers/marble
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
-	pkgdesc='Pattern'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/pattern
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-potd() {
-        pkgdesc='Picture of the Day'
-        depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-        cd $srcdir/build/wallpapers/potd
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
-	pkgdesc='Virus'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/virus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
-	pkgdesc='Weather'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/wallpapers/weather
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/kdeplasma-addons/kdeplasma-addons-applets.install b/testing/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/testing/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/kdesdk-kate/PKGBUILD b/testing/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 04337dca7..000000000
--- a/testing/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 147569 2012-01-25 23:12:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('01cfffa6e905103c1b23d4006ba5a26844cc97aa'
-          '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
-
-build() {
-  cd "${srcdir}"/kate-${pkgver}
-  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kate-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_KTEXTEDITOR=OFF
-  make
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime')
-  groups=('kde' 'kdebase')
-  url="http://www.kde.org/applications/utilities/kwrite/"
-  install='kdebase-kwrite.install'
-
-  cd "${srcdir}"/build/kwrite
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-kwrite')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-
-  cd "${srcdir}"/build/kate
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdesdk-kate/kdebase-kwrite.install b/testing/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdesdk-kate/kdebase-kwrite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdesdk-kate/kdesdk-kate.install b/testing/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 0446d161b..000000000
--- a/testing/kdesdk-kate/kdesdk-kate.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch b/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 27729d1ad..000000000
--- a/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.7.80/part/syntax/data/bash.xml~	2011-11-20 06:14:30.581097154 +0000
-+++ kate-4.7.80/part/syntax/data/bash.xml	2011-11-20 06:14:45.494553146 +0000
-@@ -8,7 +8,7 @@
-         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
-         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/testing/kdesdk/PKGBUILD b/testing/kdesdk/PKGBUILD
deleted file mode 100644
index c63829989..000000000
--- a/testing/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,258 +0,0 @@
-# $Id: PKGBUILD 147633 2012-01-25 23:54:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
-         'kdesdk-dolphin-plugins'
-         'kdesdk-kapptemplate'
-         'kdesdk-kcachegrind'
-         'kdesdk-kdeaccounts-plugin'
-         'kdesdk-kdepalettes'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
-         'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
-         'kdesdk-lokalize'
-         'kdesdk-okteta'
-         'kdesdk-poxml'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
-         'kdesdk-umbrello')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
-             'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-python2-path.patch')
-sha1sums=('2c55ed17350cb5eba4213007614e4c587feb94b9'
-          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# Fix hardcoded python2 cmd
-	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdesdk-cervisia() {
-	pkgdesc='CVS Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk-cervisia.install'
-	cd $srcdir/build/cervisia
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cervisia
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
-	pkgdesc='Extra Dolphin plugins'
-	depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
-	install='kdesdk.install'
-	cd $srcdir/build/dolphin-plugins/git
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dolphin-plugins/svn
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
-	pkgdesc='KDE Template Generator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kapptemplate/"
-	install='kdesdk.install'
-	cd $srcdir/build/kapptemplate
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapptemplate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
-	pkgdesc='Visualization of Performance Profiling Data'
-	depends=('kdebase-runtime' 'python2')
-	optdepends=('php: PHP support')
-	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk-kcachegrind.install'
-	cd $srcdir/build/kcachegrind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
-
-        # Fix python 2 path
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-                "${pkgdir}"/usr/bin/hotshot2calltree
-}
-
-package_kdesdk-kdeaccounts-plugin() {
-        pkgdesc='KDE Repository Accounts'
-        depends=('kdepim-runtime')
-        cd $srcdir/build/kdeaccounts-plugin
-        make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
-	pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
-	optdepends=('gimp')
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
-		$pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
-	depends=('kdebase-runtime' 'subversion')
-        install='kdesdk.install'
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
-	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kmtrace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmtrace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
-	pkgdesc='Diff/Patch Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kompare/"
-	install='kdesdk.install'
-	cd $srcdir/build/kompare
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
-	pkgdesc='A test application for KParts'
-	depends=('kdebase-runtime')
-	install='kdesdk.install'
-	cd $srcdir/build/kpartloader
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
-	pkgdesc='Macros helping to profile'
-	cd $srcdir/build/kprofilemethod
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
-	pkgdesc='An Object Inspector for Qt/KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kspy
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
-	pkgdesc='Startup time measurement tool for KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kstartperf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
-	pkgdesc='Qt Designer UI File Viewer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk-kuiviewer.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
-	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python')
-	url="http://kde.org/applications/development/lokalize/"
-	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk-lokalize.install'
-	cd $srcdir/build/lokalize
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
-}
-
-package_kdesdk-okteta() {
-	pkgdesc='Hex Editor'
-	depends=('kdebase-runtime')
-	replaces=('kdeutils-okteta')
-	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta/"
-	install='kdesdk-okteta.install'
-	cd $srcdir/build/okteta
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okteta
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
-	pkgdesc='Translates DocBook XML files using gettext po files'
-	depends=('qt' 'antlr2')
-	cd $srcdir/build/poxml
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
-	pkgdesc='An interface style to highlight accel and style guide conflicts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/scheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
-	pkgdesc='KDE SDK scripts'
-	depends=('python2')
-	cd $srcdir/build/scripts
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/scripts
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
-}
-
-package_kdesdk-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE SDK'
-	depends=('kdelibs')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
-	pkgdesc='UML Modeller'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk-umbrello.install'
-	cd $srcdir/build/umbrello
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
-}
diff --git a/testing/kdesdk/fix-python2-path.patch b/testing/kdesdk/fix-python2-path.patch
deleted file mode 100644
index 720487031..000000000
--- a/testing/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
-         print >>sys.stderr, "Execution failed:", e
- 
-     cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
--    if os.name!='nt': cmd='python '+cmd
-+    if os.name!='nt': cmd='python2 '+cmd
-     else: cmd=cmd.replace('/','\\')
-     os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~	2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py	2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
-     xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
- 
-     ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
--    os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+    os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
- 
- try: convert()
- except: print 'error occured'
---- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
- 
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
- 
- rm /tmp/accounts.$PPID
\ No newline at end of file
diff --git a/testing/kdesdk/kdesdk-cervisia.install b/testing/kdesdk/kdesdk-cervisia.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-cervisia.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-kcachegrind.install b/testing/kdesdk/kdesdk-kcachegrind.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-kcachegrind.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-kompare.install b/testing/kdesdk/kdesdk-kompare.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-kompare.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-kuiviewer.install b/testing/kdesdk/kdesdk-kuiviewer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-kuiviewer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-lokalize.install b/testing/kdesdk/kdesdk-lokalize.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-lokalize.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-okteta.install b/testing/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/testing/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdesdk/kdesdk-umbrello.install b/testing/kdesdk/kdesdk-umbrello.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-umbrello.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk.install b/testing/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdesdk/kdesdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdetoys/PKGBUILD b/testing/kdetoys/PKGBUILD
deleted file mode 100644
index 763c148f2..000000000
--- a/testing/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 147634 2012-01-25 23:55:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4d583cf52d10462a71df8eba907c07453f844cb2')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdetoys-amor() {
-	pkgdesc='On-Screen Creature'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/amor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/amor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc='Tea Cooker'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/kteatime
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kteatime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
-	pkgdesc='KTux'
-	depends=('kdebase-workspace' )
-	install='kdetoys.install'
-	cd $srcdir/build/ktux
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdetoys/kdetoys.install b/testing/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-filelight/PKGBUILD b/testing/kdeutils-filelight/PKGBUILD
deleted file mode 100644
index 5b68082d3..000000000
--- a/testing/kdeutils-filelight/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 147636 2012-01-25 23:56:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-filelight
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='View disk usage information'
-url='http://kde.org/applications/utilities/filelight'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-replaces=('filelight')
-conflicts=('filelight')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.bz2")
-sha1sums=('d0e628ba95f60b7c67ad10e4f6ab14d0e24fc8f5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../filelight-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-filelight/kdeutils-filelight.install b/testing/kdeutils-filelight/kdeutils-filelight.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-filelight/kdeutils-filelight.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kcalc/PKGBUILD b/testing/kdeutils-kcalc/PKGBUILD
deleted file mode 100644
index c78318519..000000000
--- a/testing/kdeutils-kcalc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147637 2012-01-25 23:56:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcalc
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Scientific Calculator'
-url='http://kde.org/applications/utilities/kcalc/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.bz2")
-sha1sums=('b832aadd21906a7bdad323b8f1cbfb59bf1b7c63')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcalc-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kcalc/kdeutils-kcalc.install b/testing/kdeutils-kcalc/kdeutils-kcalc.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-kcalc/kdeutils-kcalc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kcharselect/PKGBUILD b/testing/kdeutils-kcharselect/PKGBUILD
deleted file mode 100644
index d128b7167..000000000
--- a/testing/kdeutils-kcharselect/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147638 2012-01-25 23:56:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcharselect
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Character Selector'
-url="http://kde.org/applications/utilities/kcharselect/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.bz2")
-sha1sums=('0f4ffe3469c45317b7b76b66755e14df333835a3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcharselect-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kdf/PKGBUILD b/testing/kdeutils-kdf/PKGBUILD
deleted file mode 100644
index 8945cf91d..000000000
--- a/testing/kdeutils-kdf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147639 2012-01-25 23:57:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kdf
-pkgver=4.8.0
-pkgrel=1
-url="http://kde.org/applications/system/kdiskfree/"
-arch=('i686' 'x86_64')
-pkgdesc='View Disk Usage'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.bz2")
-sha1sums=('cc7b1450624b14ca740b64edd5b8fb54faca491e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kdf-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kdf/kdeutils-kdf.install b/testing/kdeutils-kdf/kdeutils-kdf.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-kdf/kdeutils-kdf.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kfloppy/PKGBUILD b/testing/kdeutils-kfloppy/PKGBUILD
deleted file mode 100644
index eb44d142a..000000000
--- a/testing/kdeutils-kfloppy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147640 2012-01-25 23:57:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kfloppy
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Floppy Formatter'
-url='http://kde.org/applications/utilities/kfloppy/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.bz2")
-sha1sums=('5f1ea4bf5e145ce3eb8cc136ac36c57675ad489c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kfloppy-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kfloppy/kdeutils-kfloppy.install b/testing/kdeutils-kfloppy/kdeutils-kfloppy.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-kfloppy/kdeutils-kfloppy.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kgpg/PKGBUILD b/testing/kdeutils-kgpg/PKGBUILD
deleted file mode 100644
index b865637af..000000000
--- a/testing/kdeutils-kgpg/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147641 2012-01-25 23:58:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kgpg
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='A GnuPG frontend'
-url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepim-runtime' 'kde-agent')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.bz2")
-sha1sums=('4edbfa73c62fdd99f87b5b42dd7f1330dc8f5986')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgpg-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kgpg/kdeutils-kgpg.install b/testing/kdeutils-kgpg/kdeutils-kgpg.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-kgpg/kdeutils-kgpg.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kremotecontrol/PKGBUILD b/testing/kdeutils-kremotecontrol/PKGBUILD
deleted file mode 100644
index de9443d3e..000000000
--- a/testing/kdeutils-kremotecontrol/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kremotecontrol
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Configure your remote controls for use with applications'
-url='http://kde.org/applications/utilities/kremotecontrol/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-replaces=('kdeutils-kdelirc')
-conflicts=('kdeutils-kdelirc')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.bz2")
-sha1sums=('6a4d7eede9736aa14213db082ceec5a2132c89c5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kremotecontrol-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-ksecrets/PKGBUILD b/testing/kdeutils-ksecrets/PKGBUILD
deleted file mode 100644
index ec6818e30..000000000
--- a/testing/kdeutils-ksecrets/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147643 2012-01-25 23:58:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ksecrets
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Secrets Management Infrastructure for KDE'
-url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.bz2")
-sha1sums=('13852c77b7aa76286f1108024650cb61fbc2d24e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksecrets-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeutils-ksecrets/kdeutils-ksecrets.install b/testing/kdeutils-ksecrets/kdeutils-ksecrets.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdeutils-ksecrets/kdeutils-ksecrets.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdeutils-ktimer/PKGBUILD b/testing/kdeutils-ktimer/PKGBUILD
deleted file mode 100644
index b57ccda8e..000000000
--- a/testing/kdeutils-ktimer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147644 2012-01-25 23:59:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ktimer
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Countdown Launcher'
-url='http://kde.org/applications/utilities/ktimer/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.bz2")
-sha1sums=('647cd73338d3304efbd9bd5ce79f4b9d3e094836')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktimer-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-ktimer/kdeutils-ktimer.install b/testing/kdeutils-ktimer/kdeutils-ktimer.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-ktimer/kdeutils-ktimer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kwallet/PKGBUILD b/testing/kdeutils-kwallet/PKGBUILD
deleted file mode 100644
index 3375da7b9..000000000
--- a/testing/kdeutils-kwallet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147645 2012-01-25 23:59:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kwallet
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Wallet Management Tool'
-url='http://kde.org/applications/system/kwalletmanager/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.bz2")
-sha1sums=('84828abdbaa0c0719adfc3829fb9decf1ec0f87b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwallet-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kwallet/kdeutils-kwallet.install b/testing/kdeutils-kwallet/kdeutils-kwallet.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdeutils-kwallet/kdeutils-kwallet.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdeutils-printer-applet/PKGBUILD b/testing/kdeutils-printer-applet/PKGBUILD
deleted file mode 100644
index 5fff98c0d..000000000
--- a/testing/kdeutils-printer-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 147646 2012-01-26 00:00:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-printer-applet
-pkgver=4.8.0
-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.bz2")
-sha1sums=('6d6f6afb89ac43c6f1c9393592d8645480530662')
-
-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/testing/kdeutils-superkaramba/PKGBUILD b/testing/kdeutils-superkaramba/PKGBUILD
deleted file mode 100644
index 4d1941cb0..000000000
--- a/testing/kdeutils-superkaramba/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147647 2012-01-26 00:00:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-superkaramba
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='An engine for cool desktop eyecandy'
-url='http://kde.org/applications/utilities/superkaramba/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.bz2")
-sha1sums=('1b3375814012333ddbf7d9031647fc678ba1162a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../superkaramba-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-superkaramba/kdeutils-superkaramba.install b/testing/kdeutils-superkaramba/kdeutils-superkaramba.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-superkaramba/kdeutils-superkaramba.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-sweeper/PKGBUILD b/testing/kdeutils-sweeper/PKGBUILD
deleted file mode 100644
index 419bed2e2..000000000
--- a/testing/kdeutils-sweeper/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 147648 2012-01-26 00:01:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-sweeper
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='System Cleaner'
-url='http://kde.org/applications/utilities/sweeper'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.bz2")
-sha1sums=('213abfd1d192acf619603e66c2f6e83e323e22e6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../sweeper-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils/PKGBUILD b/testing/kdeutils/PKGBUILD
deleted file mode 100644
index f766508df..000000000
--- a/testing/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# $Id: PKGBUILD 145948 2012-01-04 13:12:26Z dreisner $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
-         'kdeutils-filelight'
-         'kdeutils-kcalc'
-         'kdeutils-kcharselect'
-         'kdeutils-kdf'
-         'kdeutils-kfloppy'
-         'kdeutils-kgpg'
-         'kdeutils-kremotecontrol'
-         'kdeutils-ktimer'
-         'kdeutils-kwallet'
-         'kdeutils-printer-applet'
-         'kdeutils-superkaramba'
-         'kdeutils-sweeper')
-pkgver=4.7.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
-	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
-	'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e')
-
-build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    
-    # Use Python2
-    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
-      kcharselect/kcharselect-generate-datafile.py \
-      superkaramba/examples/richtext/rtext.py
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdeutils-ark() {
-	pkgdesc='Archiving Tool'
-	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-	url="http://kde.org/applications/utilities/ark/"
-	cd $srcdir/build/ark
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ark/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
-	pkgdesc='View disk usage information'
-	depends=('kdebase-runtime' 'qimageblitz')
-	replaces=('filelight')
-	conflicts=('filelight')
-	install='kdeutils.install'
-	url="http://methylblue.com/filelight/"
-	cd $srcdir/build/filelight
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/filelight/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
-	pkgdesc='Scientific Calculator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcalc/"
-	cd $srcdir/build/kcalc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcalc/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
-	pkgdesc='Character Selector'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcharselect/"
-	cd $srcdir/build/kcharselect
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcharselect/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
-	pkgdesc='View Disk Usage'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kdiskfree/"
-	install='kdeutils.install'
-	cd $srcdir/build/kdf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kdf/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
-	pkgdesc='Floppy Formatter'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfloppy/"
-	install='kdeutils.install'
-	cd $srcdir/build/kfloppy
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kfloppy/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
-	pkgdesc='A GnuPG frontend'
-	depends=('kdepim-runtime' 'kde-agent')
-	url="http://kde.org/applications/utilities/kgpg"
-	install='kdeutils.install'
-	cd $srcdir/build/kgpg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgpg/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
-	pkgdesc='Configure your remote controls for use with applications'
-	replaces=('kdeutils-kdelirc')
-	conflicts=('kdeutils-kdelirc')
-	depends=('kdebase-workspace')
-	url="http://kde.org/applications/utilities/kremotecontrol"
-	install='kdeutils.install'
-	cd $srcdir/build/kremotecontrol
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kremotecontrol/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
-	pkgdesc='Countdown Launcher'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/ktimer"
-	install='kdeutils.install'
-	cd $srcdir/build/ktimer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ktimer/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
-	pkgdesc='Wallet Management Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kwalletmanager/"
-	install='kdeutils.install'
-	cd $srcdir/build/kwallet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwallet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
-	pkgdesc='System tray icon for managing print jobs'
-	depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/printer-applet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/printer-applet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-superkaramba() {
-	pkgdesc='An engine for cool desktop eyecandy'
-	depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
-	url="http://kde.org/applications/utilities/superkaramba"
-	install='kdeutils.install'
-	cd $srcdir/build/superkaramba
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
-	pkgdesc='System Cleaner'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/sweeper/"
-	cd $srcdir/build/sweeper
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/sweeper/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils/kdeutils.install b/testing/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdewebdev/PKGBUILD b/testing/kdewebdev/PKGBUILD
deleted file mode 100644
index 32cdc4719..000000000
--- a/testing/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 147649 2012-01-26 00:01:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
-         'kdewebdev-kimagemapeditor'
-         'kdewebdev-klinkstatus'
-         'kdewebdev-kommander')
-pkgver=4.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('8919c3a272a954c19a4c0a742e3e686e29650aa4')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdewebdev-kfilereplace() {
-	pkgdesc='Search & Replace Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfilereplace/"
-	install='kdewebdev.install'
-	cd $srcdir/build/kfilereplace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfilereplace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
-	pkgdesc='HTML Image Map Editor'
-	depends=('kdebase-runtime')
-        url="http://www.kde.org/applications/development/kimagemapeditor/"
-	install='kdewebdev-kimagemapeditor.install'
-	cd $srcdir/build/kimagemapeditor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kimagemapeditor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
-	pkgdesc='Link Checker'
-	depends=('kdepim-runtime' 'tidyhtml')
-        url="http://www.kde.org/applications/development/klinkstatus/"
-	install='kdewebdev.install'
-	cd $srcdir/build/klinkstatus
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klinkstatus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
-	pkgdesc='Executor for Kommander dialogs'
-	depends=('kdebase-runtime')
-        url="http://www.kde.org/applications/development/kommander/"
-	cd $srcdir/build/kommander
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdewebdev/kdewebdev-kimagemapeditor.install b/testing/kdewebdev/kdewebdev-kimagemapeditor.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdewebdev/kdewebdev-kimagemapeditor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdewebdev/kdewebdev.install b/testing/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdewebdev/kdewebdev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch b/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
deleted file mode 100644
index b69d095d3..000000000
--- a/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cdaf4b2f3ef60365c6b8006a63410368a7b38f39 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:12:32 -0500
-Subject: [PATCH 1/4] partially fix parsing of alias with dots
-
----
- libkmod/libkmod-util.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
-index 7c2611b..6a9f697 100644
---- a/libkmod/libkmod-util.c
-+++ b/libkmod/libkmod-util.c
-@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- 		case ']':
- 			return -EINVAL;
- 		case '[':
--			while (alias[s] != ']' &&
--					alias[s] != '.' && alias[s] != '\0')
-+			while (alias[s] != ']' && alias[s] != '\0')
- 				s++;
- 
- 			if (alias[s] != ']')
-@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- 			s++;
- 			break;
- 		case '\0':
--		case '.':
- 			goto finish;
- 		default:
- 			buf[s] = c;
--- 
-1.7.9
-
diff --git a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
deleted file mode 100644
index 76cc35049..000000000
--- a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 1d2f64689b2456ade81d6d489c4f5bfb5fdb92fd Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:13:43 -0500
-Subject: [PATCH 2/4] libkmod-module: used shared code in module creation
-
----
- libkmod/libkmod-module.c |  135 ++++++++++++++++++++++++++-------------------
- 1 files changed, 78 insertions(+), 57 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 47b1709..48e4aa1 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -162,6 +162,76 @@ fail:
- 	return err;
- }
- 
-+/*
-+ * Memory layout with alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey -----.
-+ *        alias -----. |
-+ *        name ----. | |
-+ * }               | | |
-+ * name <----------' | |
-+ * alias <-----------' |
-+ * name\alias <--------'
-+ *
-+ * Memory layout without alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey ---.
-+ *        alias -----|----> NULL
-+ *        name ----. |
-+ * }               | |
-+ * name <----------'-'
-+ *
-+ * @key is "name\alias" or "name" (in which case alias == NULL)
-+ */
-+static int kmod_module_new(struct kmod_ctx *ctx, const char *key,
-+				const char *name, size_t namelen,
-+				const char *alias, size_t aliaslen,
-+				struct kmod_module **mod)
-+{
-+	struct kmod_module *m;
-+	size_t keylen;
-+
-+	m = kmod_pool_get_module(ctx, key);
-+	if (m != NULL) {
-+		*mod = kmod_module_ref(m);
-+		return 0;
-+	}
-+
-+	if (alias == NULL)
-+		keylen = namelen;
-+	else
-+		keylen = namelen + aliaslen + 1;
-+
-+	m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1));
-+	if (m == NULL) {
-+		free(m);
-+		return -ENOMEM;
-+	}
-+
-+	memset(m, 0, sizeof(*m));
-+
-+	m->ctx = kmod_ref(ctx);
-+	m->name = (char *)m + sizeof(*m);
-+	memcpy(m->name, key, keylen + 1);
-+	if (alias == NULL) {
-+		m->hashkey = m->name;
-+		m->alias = NULL;
-+	} else {
-+		m->name[namelen] = '\0';
-+		m->alias = m->name + namelen + 1;
-+		m->hashkey = m->name + keylen + 1;
-+		memcpy(m->hashkey, key, keylen + 1);
-+	}
-+
-+	m->refcount = 1;
-+	kmod_pool_add_module(ctx, m, m->hashkey);
-+	*mod = m;
-+
-+	return 0;
-+}
-+
- /**
-  * kmod_module_new_from_name:
-  * @ctx: kmod library context
-@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
- 						const char *name,
- 						struct kmod_module **mod)
- {
--	struct kmod_module *m;
- 	size_t namelen;
- 	char name_norm[PATH_MAX];
--	char *namesep;
- 
- 	if (ctx == NULL || name == NULL || mod == NULL)
- 		return -ENOENT;
- 
--	if (alias_normalize(name, name_norm, &namelen) < 0) {
--		DBG(ctx, "invalid alias: %s\n", name);
--		return -EINVAL;
--	}
-+	modname_normalize(name, name_norm, &namelen);
- 
--	m = kmod_pool_get_module(ctx, name_norm);
--	if (m != NULL) {
--		*mod = kmod_module_ref(m);
--		return 0;
--	}
--
--	namesep = strchr(name_norm, '/');
--	m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2);
--	if (m == NULL) {
--		free(m);
--		return -ENOMEM;
--	}
--
--	memset(m, 0, sizeof(*m));
--
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name_norm, namelen + 1);
--
--	if (namesep) {
--		size_t len = namesep - name_norm;
--
--		m->name[len] = '\0';
--		m->alias = m->name + len + 1;
--		m->hashkey = m->name + namelen + 1;
--		memcpy(m->hashkey, name_norm, namelen + 1);
--	} else {
--		m->hashkey = m->name;
--	}
--
--	m->refcount = 1;
--	kmod_pool_add_module(ctx, m, m->hashkey);
--	*mod = m;
--
--	return 0;
-+	return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod);
- }
- 
- int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
-@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
- 
- 	memcpy(key, name, namelen);
- 	memcpy(key + namelen + 1, alias, aliaslen + 1);
--	key[namelen] = '/';
-+	key[namelen] = '\\';
- 
--	err = kmod_module_new_from_name(ctx, key, mod);
-+	err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod);
- 	if (err < 0)
- 		return err;
- 
-@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 			free(abspath);
- 		else {
- 			ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n",
--									name, abspath, m->path);
-+							name, abspath, m->path);
- 			free(abspath);
- 			return -EEXIST;
- 		}
-@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 		return 0;
- 	}
- 
--	m = malloc(sizeof(*m) + namelen + 1);
--	if (m == NULL)
--		return -errno;
--
--	memset(m, 0, sizeof(*m));
-+	err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
-+	if (err < 0)
-+		return err;
- 
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name, namelen + 1);
- 	m->path = abspath;
--	m->hashkey = m->name;
--	m->refcount = 1;
--
--	kmod_pool_add_module(ctx, m, m->hashkey);
--
- 	*mod = m;
- 
- 	return 0;
--- 
-1.7.9
-
diff --git a/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch b/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
deleted file mode 100644
index 5bbc93a90..000000000
--- a/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fdf78d80d298353c29e1fe8c00602669dd9662bb Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:05:26 -0500
-Subject: [PATCH 3/4] modprobe: handle all error returns from init_module
-
----
- tools/kmod-modprobe.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 3e51506..c882856 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -551,6 +551,8 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- 
- 	err = kmod_module_insert_module(mod, flags, opts);
- 	switch (err) {
-+	case 0:
-+		break;
- 	case -EEXIST:
- 		/*
- 		 * We checked for EEXIST with an earlier call to
-@@ -564,7 +566,7 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- 			ERR("Module %s already in kernel.\n",
- 					kmod_module_get_name(mod));
- 		break;
--	case -EPERM:
-+	default:
- 		ERR("could not insert '%s': %s\n", kmod_module_get_name(mod),
- 				strerror(-err));
- 		break;
--- 
-1.7.9
-
diff --git a/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch b/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch
deleted file mode 100644
index 80cc73130..000000000
--- a/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4e3dd21aff55b5bbaa08b037fc2a5625bfffc0a5 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:39:30 -0500
-Subject: [PATCH 4/4] modprobe: remove 0 refcnt deps
-
----
- tools/kmod-modprobe.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index c882856..bd991a5 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -381,7 +381,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
- static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- {
- 	const char *modname = kmod_module_get_name(mod);
--	struct kmod_list *pre = NULL, *post = NULL;
-+	struct kmod_list *pre = NULL, *post = NULL, *deps, *itr;
- 	const char *cmd = NULL;
- 	int err;
- 
-@@ -422,7 +422,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- 	rmmod_do_deps_list(post, false);
- 
- 	if (do_dependencies && remove_dependencies) {
--		struct kmod_list *deps = kmod_module_get_dependencies(mod);
-+		deps = kmod_module_get_dependencies(mod);
- 
- 		err = rmmod_do_deps_list(deps, true);
- 		if (err < 0)
-@@ -451,6 +451,17 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- 
- 	rmmod_do_deps_list(pre, false);
- 
-+	deps = kmod_module_get_dependencies(mod);
-+	if (deps != NULL) {
-+		kmod_list_foreach_reverse(itr, deps) {
-+			struct kmod_module *dep = kmod_module_get_module(itr);
-+			if (kmod_module_get_refcnt(dep) == 0)
-+				rmmod_do_remove_module(dep);
-+			kmod_module_unref(dep);
-+		}
-+		kmod_module_unref_list(deps);
-+	}
-+
- error:
- 	kmod_module_unref_list(pre);
- 	kmod_module_unref_list(post);
--- 
-1.7.9
-
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
deleted file mode 100644
index b1566507b..000000000
--- a/testing/kmod/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 148396 2012-01-31 05:23:46Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=4
-pkgrel=2
-pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
-license=('GPL2')
-depends=('glibc' 'zlib')
-makedepends=('docbook2x')
-options=('!libtool')
-provides=('module-init-tools=3.16')
-conflicts=('module-init-tools')
-replaces=('module-init-tools')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
-        0001-partially-fix-parsing-of-alias-with-dots.patch
-        0002-libkmod-module-used-shared-code-in-module-creation.patch
-        0003-modprobe-handle-all-error-returns-from-init_module.patch
-        0004-modprobe-remove-0-refcnt-deps.patch
-        "depmod-search.conf")
-md5sums=('e14450a066a48accd0af1995b3c0232d'
-         '5f497ab3466ee1a616b6e6c97b330706'
-         '23a9257a152862753ce4c4ee7287761a'
-         '3a57671b0f37b1203b207f35a4442ae3'
-         '1fe88eee9302104b179124ce6bfc55d2'
-         '4b8cbcbc54b9029c99fd730e257d4436')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir/0001-partially-fix-parsing-of-alias-with-dots.patch"
-  patch -Np1 <"$srcdir/0002-libkmod-module-used-shared-code-in-module-creation.patch"
-  patch -Np1 <"$srcdir/0003-modprobe-handle-all-error-returns-from-init_module.patch"
-  patch -Np1 <"$srcdir/0004-modprobe-remove-0-refcnt-deps.patch"
-
-  ./configure \
-    --sysconfdir=/etc \
-    --with-rootprefix= \
-    --with-zlib
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # binary directories
-  install -dm755 "$pkgdir"/{,s}bin
-
-  # configuration directories
-  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
-
-  # add symlinks to kmod
-  ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"
-  for tool in {ins,rm,dep}mod mod{info,probe}; do
-    ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool"
-  done
-
-  # install depmod.d file for search/ dir
-  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf
deleted file mode 100644
index 3feb67b05..000000000
--- a/testing/kmod/depmod-search.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/depmod.d/depmod.conf
-#
-
-search updates extramodules built-in
diff --git a/testing/kmod/fix-error-path-when-loading-deps.patch b/testing/kmod/fix-error-path-when-loading-deps.patch
deleted file mode 100644
index 0046d19b9..000000000
--- a/testing/kmod/fix-error-path-when-loading-deps.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cb0d0b72128ac566aad9a72800c5a64af66f0b6e Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Sun, 8 Jan 2012 18:08:05 -0200
-Subject: [PATCH] modprobe: fix error path when loading dependencies
-
-demarchi> scenario is the following:
-demarchi> modA depends on modB and modC
-demarchi> if there's a race when trying to insert a dependency of a module, say
-          modB, it will stop loading all the modules
-demarchi> it should check by "module already loaded error"
-demarchi> like it does for modA
----
- tools/kmod-modprobe.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index eaf9346..2cda935 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -666,9 +666,11 @@ static int insmod_do_deps_list(struct kmod_module *parent, struct kmod_list *dep
- 				flags |= KMOD_INSERT_FORCE_VERMAGIC;
- 
- 			r = kmod_module_insert_module(dm, flags, opts);
-+			if (r == -EEXIST && !first_time)
-+				r = 0;
- 			if (r < 0) {
- 				WRN("could not insert '%s': %s\n",
--				    dmname, strerror(-r));
-+						dmname, strerror(-r));
- 				goto dep_error;
- 			}
- 		}
--- 
-1.7.8.1
-
diff --git a/testing/kmod/return-non-zero-on-fail.patch b/testing/kmod/return-non-zero-on-fail.patch
deleted file mode 100644
index 4802a825f..000000000
--- a/testing/kmod/return-non-zero-on-fail.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index b6af26f..8506193 100644
---- a/tools/kmod-modinfo.c
-+++ b/tools/kmod-modinfo.c
-@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
- 		LOG("Module alias %s not found.\n", alias);
- 		return err;
- 	}
-+
-+	if (list == NULL) {
-+		LOG("Module %s not found.\n", alias);
-+		return -ENOENT;
-+	}
-+
- 	kmod_list_foreach(l, list) {
- 		struct kmod_module *mod = kmod_module_get_module(l);
- 		int r = modinfo_do(mod);
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 8286b9b..6ca94f2 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
- 
- 	if (list == NULL) {
- 		LOG("Module %s not found.\n", alias);
--		return err;
-+		return -ENOENT;
- 	}
- 
- 	if (use_blacklist) {
diff --git a/testing/kmod/use-path-max-for-alias-names.patch b/testing/kmod/use-path-max-for-alias-names.patch
deleted file mode 100644
index e97ae7c49..000000000
--- a/testing/kmod/use-path-max-for-alias-names.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 6daceb2f1f4d442ba04752aaa1cf43d554d5f646 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Sun, 8 Jan 2012 01:02:29 -0200
-Subject: [PATCH] Replace NAME_MAX with PATH_MAX for module aliases
-
-Module aliases can be bigger than NAME_MAX. So, replace with PATH_MAX
-that is bigger enough to hold them.
-
-Technically in some places NAME_MAX would be sufficient (those using
-module names only), but they use functions that can be called with
-alias. So increase the buffers in these cases to PATH_MAX too.
----
- libkmod/libkmod-module.c |   10 +++++-----
- libkmod/libkmod-util.c   |   10 +++++-----
- libkmod/libkmod-util.h   |    6 +++---
- tools/kmod-depmod.c      |    4 ++--
- 4 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index f2359a9..880bac5 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -185,7 +185,7 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
- {
- 	struct kmod_module *m;
- 	size_t namelen;
--	char name_norm[NAME_MAX];
-+	char name_norm[PATH_MAX];
- 	char *namesep;
- 
- 	if (ctx == NULL || name == NULL || mod == NULL)
-@@ -237,11 +237,11 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
- 				const char *name, struct kmod_module **mod)
- {
- 	int err;
--	char key[NAME_MAX];
-+	char key[PATH_MAX];
- 	size_t namelen = strlen(name);
- 	size_t aliaslen = strlen(alias);
- 
--	if (namelen + aliaslen + 2 > NAME_MAX)
-+	if (namelen + aliaslen + 2 > PATH_MAX)
- 		return -ENAMETOOLONG;
- 
- 	memcpy(key, name, namelen);
-@@ -283,7 +283,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 	struct kmod_module *m;
- 	int err;
- 	struct stat st;
--	char name[NAME_MAX];
-+	char name[PATH_MAX];
- 	char *abspath;
- 	size_t namelen;
- 
-@@ -434,7 +434,7 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx,
- 						struct kmod_list **list)
- {
- 	int err;
--	char alias[NAME_MAX];
-+	char alias[PATH_MAX];
- 
- 	if (ctx == NULL || given_alias == NULL)
- 		return -ENOENT;
-diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
-index 75e2fea..344d94a 100644
---- a/libkmod/libkmod-util.c
-+++ b/libkmod/libkmod-util.c
-@@ -121,11 +121,11 @@ char *underscores(struct kmod_ctx *ctx, char *s)
- 	return s;
- }
- 
--inline int alias_normalize(const char *alias, char buf[NAME_MAX], size_t *len)
-+inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- {
- 	size_t s;
- 
--	for (s = 0; s < NAME_MAX - 1; s++) {
-+	for (s = 0; s < PATH_MAX - 1; s++) {
- 		const char c = alias[s];
- 		switch (c) {
- 		case '-':
-@@ -160,12 +160,12 @@ finish:
- 	return 0;
- }
- 
--inline char *modname_normalize(const char *modname, char buf[NAME_MAX],
-+inline char *modname_normalize(const char *modname, char buf[PATH_MAX],
- 								size_t *len)
- {
- 	size_t s;
- 
--	for (s = 0; s < NAME_MAX - 1; s++) {
-+	for (s = 0; s < PATH_MAX - 1; s++) {
- 		const char c = modname[s];
- 		if (c == '-')
- 			buf[s] = '_';
-@@ -183,7 +183,7 @@ inline char *modname_normalize(const char *modname, char buf[NAME_MAX],
- 	return buf;
- }
- 
--char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len)
-+char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len)
- {
- 	char *modname;
- 
-diff --git a/libkmod/libkmod-util.h b/libkmod/libkmod-util.h
-index 3cd352c..e8ed5ad 100644
---- a/libkmod/libkmod-util.h
-+++ b/libkmod/libkmod-util.h
-@@ -20,9 +20,9 @@ int read_str_ulong(int fd, unsigned long *value, int base) __must_check __attrib
- char *strchr_replace(char *s, int c, char r);
- bool path_is_absolute(const char *p) __must_check __attribute__((nonnull(1)));
- char *path_make_absolute_cwd(const char *p) __must_check __attribute__((nonnull(1)));
--int alias_normalize(const char *alias, char buf[NAME_MAX], size_t *len) __must_check __attribute__((nonnull(1,2)));
--char *modname_normalize(const char *modname, char buf[NAME_MAX], size_t *len) __attribute__((nonnull(1, 2)));
--char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len) __attribute__((nonnull(2)));
-+int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) __must_check __attribute__((nonnull(1,2)));
-+char *modname_normalize(const char *modname, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(1, 2)));
-+char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(2)));
- unsigned long long ts_usec(const struct timespec *ts);
- 
- #endif
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 70c397c..4726522 100644
---- a/tools/kmod-depmod.c
-+++ b/tools/kmod-depmod.c
-@@ -1249,7 +1249,7 @@ static int depmod_modules_search_file(struct depmod *depmod, size_t baselen, siz
- 	struct kmod_module *kmod;
- 	struct mod *mod;
- 	const char *relpath;
--	char modname[NAME_MAX];
-+	char modname[PATH_MAX];
- 	const struct kmod_ext *eitr;
- 	size_t modnamelen;
- 	uint8_t matches = 0;
-@@ -2101,7 +2101,7 @@ static int output_builtin_bin(struct depmod *depmod, FILE *out)
- {
- 	FILE *in;
- 	struct index_node *idx;
--	char infile[PATH_MAX], line[PATH_MAX], modname[NAME_MAX];
-+	char infile[PATH_MAX], line[PATH_MAX], modname[PATH_MAX];
- 
- 	if (out == stdout)
- 		return 0;
--- 
-1.7.8.1
-
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
deleted file mode 100644
index 28229f186..000000000
--- a/testing/libarchive/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 147250 2012-01-25 03:21:31Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=libarchive
-pkgver=3.0.3
-pkgrel=3
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/"
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
-        'interpret-non-posix-zips.patch'
-        'test-with-zip-mtime.patch')
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
-         'f02b88eb10877c7a7d527ed89c662e44'
-         '8366def6d7d70d424fa28a986c78c015')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
-            '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
-            'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=225
-  patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=231
-  patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
-
-  ./configure --prefix=/usr --without-xml2
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
diff --git a/testing/libarchive/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/release-2.8-fixes.patch b/testing/libarchive/release-2.8-fixes.patch
deleted file mode 100644
index c21eeaa7b..000000000
--- a/testing/libarchive/release-2.8-fixes.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: build/cmake/config.h.in
-===================================================================
---- build/cmake/config.h.in	(revision 3670)
-+++ build/cmake/config.h.in	(revision 3737)
-@@ -1,5 +1,8 @@
- /* config.h.  Generated from config.h.cmake by cmake configure */
- 
-+/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
-+#cmakedefine ZLIB_WINAPI 1
-+
- /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
- #cmakedefine ARCHIVE_HASH_MD5_LIBC
- 
-Index: libarchive/archive_read_support_format_all.c
-===================================================================
---- libarchive/archive_read_support_format_all.c	(revision 3670)
-+++ libarchive/archive_read_support_format_all.c	(revision 3737)
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2003-2007 Tim Kientzle
-+ * Copyright (c) 2003-2011 Tim Kientzle
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-@@ -39,5 +39,13 @@
- 	archive_read_support_format_tar(a);
- 	archive_read_support_format_xar(a);
- 	archive_read_support_format_zip(a);
-+
-+	/* Note: We always return ARCHIVE_OK here, even if some of the
-+	 * above return ARCHIVE_WARN.  The intent here is to enable
-+	 * "as much as possible."  Clients who need specific
-+	 * compression should enable those individually so they can
-+	 * verify the level of support. */
-+	/* Clear any warning messages set by the above functions. */
-+	archive_clear_error(a);
- 	return (ARCHIVE_OK);
- }
-Index: libarchive/archive_write_disk.c
-===================================================================
---- libarchive/archive_write_disk.c	(revision 3670)
-+++ libarchive/archive_write_disk.c	(revision 3737)
-@@ -1513,6 +1513,22 @@
- }
- 
- #if defined(_WIN32) || defined(__CYGWIN__)
-+static int
-+guidword(const char *p, int n)
-+{
-+	int i;
-+
-+	for (i = 0; i < n; i++) {
-+		if ((*p >= '0' && *p <= '9') ||
-+		    (*p >= 'a' && *p <= 'f') ||
-+		    (*p >= 'A' && *p <= 'F'))
-+			p++;
-+		else
-+			return (-1);
-+	}
-+	return (0);
-+}
-+
- /*
-  * 1. Convert a path separator from '\' to '/' .
-  *    We shouldn't check multi-byte character directly because some
-@@ -1521,26 +1537,92 @@
-  * 2. Replace unusable characters in Windows with underscore('_').
-  * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
-  */
--static void
-+static int
- cleanup_pathname_win(struct archive_write_disk *a)
- {
- 	wchar_t wc;
- 	char *p;
- 	size_t alen, l;
- 
--	alen = 0;
--	l = 0;
--	for (p = a->name; *p != '\0'; p++) {
--		++alen;
--		if (*p == '\\')
--			l = 1;
-+	p = a->name;
-+	/* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
-+	 * "\\?\Volume{GUID}\"
-+	 * (absolute path prefixes used by Windows API) */
-+	if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
-+	    (p[2] == '.' || p[2] == '?') && (p[3] ==  '\\' || p[3] == '/'))
-+	{
-+		/* A path begin with "\\?\UNC\" */
-+		if (p[2] == '?' &&
-+		    (p[4] == 'U' || p[4] == 'u') &&
-+		    (p[5] == 'N' || p[5] == 'n') &&
-+		    (p[6] == 'C' || p[6] == 'c') &&
-+		    (p[7] == '\\' || p[7] == '/'))
-+			p += 8;
-+		/* A path begin with "\\?\Volume{GUID}\" */
-+		else if (p[2] == '?' &&
-+		    (p[4] == 'V' || p[4] == 'v') &&
-+		    (p[5] == 'O' || p[5] == 'o') &&
-+		    (p[6] == 'L' || p[6] == 'l') &&
-+		    (p[7] == 'U' || p[7] == 'u') &&
-+		    (p[8] == 'M' || p[8] == 'm') &&
-+		    (p[9] == 'E' || p[9] == 'e') &&
-+		    p[10] == '{') {
-+			if (guidword(p+11, 8) == 0 && p[19] == '-' &&
-+			    guidword(p+20, 4) == 0 && p[24] == '-' &&
-+			    guidword(p+25, 4) == 0 && p[29] == '-' &&
-+			    guidword(p+30, 4) == 0 && p[34] == '-' &&
-+			    guidword(p+35, 12) == 0 && p[47] == '}' &&
-+			    (p[48] == '\\' || p[48] == '/'))
-+				p += 49;
-+			else
-+				p += 4;
-+		/* A path begin with "\\.\PhysicalDriveX" */
-+		} else if (p[2] == '.' &&
-+		    (p[4] == 'P' || p[4] == 'p') &&
-+		    (p[5] == 'H' || p[5] == 'h') &&
-+		    (p[6] == 'Y' || p[6] == 'y') &&
-+		    (p[7] == 'S' || p[7] == 's') &&
-+		    (p[8] == 'I' || p[8] == 'i') &&
-+		    (p[9] == 'C' || p[9] == 'c') &&
-+		    (p[9] == 'A' || p[9] == 'a') &&
-+		    (p[9] == 'L' || p[9] == 'l') &&
-+		    (p[9] == 'D' || p[9] == 'd') &&
-+		    (p[9] == 'R' || p[9] == 'r') &&
-+		    (p[9] == 'I' || p[9] == 'i') &&
-+		    (p[9] == 'V' || p[9] == 'v') &&
-+		    (p[9] == 'E' || p[9] == 'e') &&
-+		    (p[10] >= '0' && p[10] <= '9') &&
-+		    p[11] == '\0') {
-+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+			    "Path is a physical drive name");
-+			return (ARCHIVE_FAILED);
-+		} else
-+			p += 4;
-+	}
-+
-+	/* Skip leading drive letter from archives created
-+	 * on Windows. */
-+	if (((p[0] >= 'a' && p[0] <= 'z') ||
-+	     (p[0] >= 'A' && p[0] <= 'Z')) &&
-+		 p[1] == ':') {
-+		if (p[2] == '\0') {
-+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+			    "Path is a drive name");
-+			return (ARCHIVE_FAILED);
-+		}
-+		if (p[2] == '\\' || p[2] == '/')
-+			p += 3;
-+	}
-+
-+	for (; *p != '\0'; p++) {
- 		/* Rewrite the path name if its character is a unusable. */
- 		if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
- 		    *p == '<' || *p == '>' || *p == '|')
- 			*p = '_';
- 	}
--	if (alen == 0 || l == 0)
--		return;
-+	alen = p - a->name;
-+	if (alen == 0 || strchr(a->name, '\\') == NULL)
-+		return (ARCHIVE_OK);
- 	/*
- 	 * Convert path separator.
- 	 */
-@@ -1560,6 +1642,7 @@
- 		p += l;
- 		alen -= l;
- 	}
-+	return (ARCHIVE_OK);
- }
- #endif
- 
-@@ -1583,7 +1666,8 @@
- 	}
- 
- #if defined(_WIN32) || defined(__CYGWIN__)
--	cleanup_pathname_win(a);
-+	if (cleanup_pathname_win(a) != ARCHIVE_OK)
-+		return (ARCHIVE_FAILED);
- #endif
- 	/* Skip leading '/'. */
- 	if (*src == '/')
-Index: libarchive/archive_util.c
-===================================================================
---- libarchive/archive_util.c	(revision 3670)
-+++ libarchive/archive_util.c	(revision 3737)
-@@ -155,6 +155,7 @@
- {
- 	archive_string_empty(&a->error_string);
- 	a->error = NULL;
-+	a->archive_error_number = 0;
- }
- 
- void
-Index: libarchive/archive_read_extract.c
-===================================================================
---- libarchive/archive_read_extract.c	(revision 3670)
-+++ libarchive/archive_read_extract.c	(revision 3737)
-@@ -108,7 +108,7 @@
- 	if (r != ARCHIVE_OK)
- 		/* If _write_header failed, copy the error. */
-  		archive_copy_error(&a->archive, ad);
--	else if (archive_entry_size(entry) > 0)
-+	else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
- 		/* Otherwise, pour data into the entry. */
- 		r = copy_data(_a, ad);
- 	r2 = archive_write_finish_entry(ad);
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 3670)
-+++ CMakeLists.txt	(revision 3737)
-@@ -154,6 +154,13 @@
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  IF(WIN32 AND NOT CYGWIN)
-+    SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-+    SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+    CHECK_C_SOURCE_Runs(
-+      "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+      ZLIB_WINAPI)
-+  ENDIF(WIN32 AND NOT CYGWIN)
- ENDIF(ZLIB_FOUND)
- MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
- MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
-
-Property changes on: .
-___________________________________________________________________
-Modified: svn:mergeinfo
-   Merged /trunk:r1989,3247,3722
-
diff --git a/testing/libarchive/sparse-file.patch b/testing/libarchive/sparse-file.patch
deleted file mode 100644
index e7d3e473b..000000000
--- a/testing/libarchive/sparse-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libarchive/archive_write_set_format_pax.c
-===================================================================
---- libarchive/archive_write_set_format_pax.c	(revision 4094)
-+++ libarchive/archive_write_set_format_pax.c	(working copy)
-@@ -1647,7 +1647,7 @@
- 			return (total);
- 
- 		p = ((const unsigned char *)buff) + total;
--		ws = s;
-+		ws = s - total;
- 		if (ws > pax->sparse_list->remaining)
- 			ws = pax->sparse_list->remaining;
- 
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 e60ca25f3..000000000
--- a/testing/libdrm/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 146279 2012-01-07 22:21:14Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.30
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-#	git_fixes.diff
-)
-md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
-         'fb8a15bf4aff5646c517373e8277f440'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
-
-  # git fixes - currently none
-#  patch -Np1 -i ${srcdir}/git_fixes.diff
-  
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-vmwgfx-experimental-api \
-      --enable-nouveau-experimental-api
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/testing/libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- 				      bufmgr_gem->vma_cache.next,
- 				      vma_list);
- 		assert(bo_gem->map_count == 0);
--		DRMLISTDEL(&bo_gem->vma_list);
-+		DRMLISTDELINIT(&bo_gem->vma_list);
- 
- 		if (bo_gem->mem_virtual) {
- 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 03bb66953..000000000
--- a/testing/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/testing/libetpan/PKGBUILD b/testing/libetpan/PKGBUILD
deleted file mode 100644
index 404e869cd..000000000
--- a/testing/libetpan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 146341 2012-01-09 18:52:32Z stephane $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=libetpan
-pkgver=1.0
-pkgrel=4
-pkgdesc="A portable middleware for email access"
-arch=('i686' 'x86_64')
-url="http://www.etpan.org/"
-license=("custom:etpan")
-depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5addc766141a0b1d29ee1ca4ba1b6808')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/license.txt
-}
diff --git a/testing/libkdcraw/PKGBUILD b/testing/libkdcraw/PKGBUILD
deleted file mode 100644
index 10217f812..000000000
--- a/testing/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147580 2012-01-25 23:19:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4c613177ec8cfe1436e5fb7f3b61bbb306d13f71')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkdcraw/libkdcraw.install b/testing/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libkdcraw/libkdcraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/libkdeedu/PKGBUILD b/testing/libkdeedu/PKGBUILD
deleted file mode 100644
index 93d075e1a..000000000
--- a/testing/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147578 2012-01-25 23:18:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ca40cfa3ac019ab986ca062a1c7a8be5c3b366af')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkdeedu/libkdeedu.install b/testing/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libkdeedu/libkdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/libkexiv2/PKGBUILD b/testing/libkexiv2/PKGBUILD
deleted file mode 100644
index bc8a2ec0e..000000000
--- a/testing/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147581 2012-01-25 23:20:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4536ffd3df63a8dcf68bf8ab221ba0c09be417c6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkipi/PKGBUILD b/testing/libkipi/PKGBUILD
deleted file mode 100644
index 18872de58..000000000
--- a/testing/libkipi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkipi
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1eccc5b6dda059eee10b2ae3e0ef6a47953eb084')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkipi/libkipi.install b/testing/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libkipi/libkipi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/libksane/PKGBUILD b/testing/libksane/PKGBUILD
deleted file mode 100644
index 0b05ce329..000000000
--- a/testing/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 147583 2012-01-25 23:20:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="An image scanning library"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'sane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('417e0e65d3045548a29a9acdcbe1b0511a42295a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libksane/libksane.install b/testing/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libksane/libksane.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/libreoffice/PKGBUILD.next_stable34 b/testing/libreoffice/PKGBUILD.next_stable34
deleted file mode 100644
index 5b9dec2ab..000000000
--- a/testing/libreoffice/PKGBUILD.next_stable34
+++ /dev/null
@@ -1,925 +0,0 @@
-# $Id: PKGBUILD 145674 2011-12-26 20:12:16Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	#'libreoffice-extension-barcode' # 
-	'libreoffice-extension-diagram'
-	'libreoffice-extension-google-docs'
-	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-	'libreoffice-extension-nlpsolver'
-	'libreoffice-extension-ct2n'
-	'libreoffice-extension-numbertext'	
-	'libreoffice-extension-oooblogger'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
-	'libreoffice-extension-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-typo'
-	'libreoffice-extension-validator'
-	'libreoffice-extension-watch-window'
-	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.5.2
-pkgver=3.4.5rc2 # last expected release candidate (should become final ) - Release 3.4.5 	Week 2 , Jan 9 - Jan 15, 2012 
-pkgrel=1
-arch=('i686' 'x86_64')
-#_LO_tree="3.4"
-_OFFICEUPD="340"
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
-             'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the depends from libreoffice main pkg
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
-	     'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
-_additional_source_url="http://hg.services.openoffice.org/binaries"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_boost.diff
-	buildfix_ct2n.diff
-	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	#oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	#RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-	gcc462_buildfix.diff)
-noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
-         'c1e2dabdf4cfcd5957779014a7f9787e'
-         '79c9c7fc208e7f56af09f284f261a7da'
-         'c83a8a374d3d5cc83c6ac3b5ff613e46'
-         'fa64799ebad8cbd2c160ac2f87bd5599'
-         'b24fba57aa4185934e86a0a8db4a3433'
-         '4f98020088ab9b597fc21b617121bd47'
-         '3c3be7c5f923339c90b0d1d6ecad0243'
-         '3a0bb4bb096b7488533ed2ee466a2bc9'
-         'f2b180aa1eff3884b4ca81c048f1e327'
-         'a9af488ef92ad4442eafba874249c529'
-         'db6a67c96a9090bc5e21b64e202a984e'
-         'e00187ae0840e1f6a00fa3290cacf0d1'
-         '20fbf6cffd2b06e90a52105b75a57828'
-         '4af055f590732ec19a2534b2278ac49c'
-         'c84693796d2b1d9c8269425b1fa53aef'
-         'd4926dc27b6884656feec6753f4fdf22'
-         '770678ca19cca0f7985c1c82b2dccf48'
-         '97a1e3de430b124faf35bf334248ad53'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '185d60944ea767075d27247c3162b3bc'
-         '90401bca927835b6fbae4a707ed187c8'
-         '451ccf439a36a568653b024534669971'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '10600d04ee81014bc9b5cc04e615d799')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-	# move all LibO sources into one build directory
-	mkdir ${srcdir}/build && cd ${srcdir}/build
-	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
-	  mv ${srcdir}/$i/* .
-	done
-#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
-#	./bin/unpack-sources ${srcdir}/build
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-
-	cd ${srcdir}/build
-
-	# buildfixes & bugfixes
-	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
-	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	#patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	#patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
-#	patch -Np1 -i ${srcdir}/gcc462_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
-
-	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-#	if [ "$CARCH" = "x86_64" ]; then
-#	      EXTRAOPTS="--without-stlport"
-#	 else 
-#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-#	      # # avoid problems with ixion for now
-#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-#	fi
-
-	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-cairo\
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-ldap \
-		--enable-lockdown\
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-barcode \
-		--enable-ext-diagram \
-		--enable-ext-google-docs \
-		--enable-ext-hunart \
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-ext-nlpsolver \
-		--enable-ext-ct2n \
-		--enable-ext-numbertext \
-		--enable-ext-oooblogger \
-		--enable-ext-pdfimport \
-		--enable-ext-presenter-console \
-		--enable-ext-presenter-minimizer \
-		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-scripting-python \
-		--enable-ext-typo \
-		--enable-ext-validator \
-		--enable-ext-watch-window \
-		--enable-ext-wiki-publisher \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--with-system-libtextcat \
-		--with-external-libtextcat-data \
-		--with-openldap\
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mozilla\
-		--with-system-mythes\
-		--with-system-xrender-headers\
-		--with-system-headers\
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	unset MAKEFLAGS
-	./bootstrap
-	make
-	
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'libldap:          to get profiles via ldap'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/testing/libsasl/0003_saslauthd_mdoc.patch b/testing/libsasl/0003_saslauthd_mdoc.patch
deleted file mode 100644
index 694f4bb67..000000000
--- a/testing/libsasl/0003_saslauthd_mdoc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
-
-Use the correct path for the saslauthd.conf file, and use another
-date format (cosmetic).
-
-diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
---- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
-@@ -10,7 +10,7 @@
- .\" manpage in saslauthd.8 whenever you change this source
- .\" version. Only the pre-formatted manpage is installed.
- .\"
--.Dd 10 24 2002
-+.Dd October 24 2002
- .Dt SASLAUTHD 8
- .Os "CMU-SASL"
- .Sh NAME
-@@ -216,7 +216,7 @@
- .Em (All platforms that support OpenLDAP 2.0 or higher)
- .Pp
- Authenticate against an ldap server.  The ldap configuration parameters are
--read from /usr/local/etc/saslauthd.conf.  The location of this file can be
-+read from /etc/saslauthd.conf.  The location of this file can be
- changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
- distribution for the list of available parameters.
- .It Li sia
-@@ -249,7 +249,7 @@
- .Bl -tag -width "/var/run/saslauthd/mux"
- .It Pa /var/run/saslauthd/mux
- The default communications socket.
--.It Pa /usr/local/etc/saslauthd.conf
-+.It Pa /etc/saslauthd.conf
- The default configuration file for ldap support.
- .El
- .Sh SEE ALSO
diff --git a/testing/libsasl/0010_maintainer_mode.patch b/testing/libsasl/0010_maintainer_mode.patch
deleted file mode 100644
index cf3d02a08..000000000
--- a/testing/libsasl/0010_maintainer_mode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable maintainer mode to avoid auto* problems.
-
-@DPATCH@
-diff -urNad trunk~/configure.in trunk/configure.in
---- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
-+++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
-@@ -62,6 +62,8 @@
- AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
- CMU_INIT_AUTOMAKE
- 
-+AM_MAINTAINER_MODE
-+
- # and include our config dir scripts
- ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
- 
diff --git a/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch b/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch
deleted file mode 100644
index 3805b4857..000000000
--- a/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
-
-Enable libtool use.
-
-diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
---- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
-@@ -25,6 +25,7 @@
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/testing/libsasl/0012_xopen_crypt_prototype.patch b/testing/libsasl/0012_xopen_crypt_prototype.patch
deleted file mode 100644
index d50ec8343..000000000
--- a/testing/libsasl/0012_xopen_crypt_prototype.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
-
-When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
-will define a correct function prototype for the crypt function.
-This avoids segfaults on architectures where the size of a pointer
-is greater than the size of an integer (ia64 and amd64 are examples).
-This may be detected by looking for build log lines such as the
-following:
-auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
-auth_shadow.c:183: warning: cast to pointer from integer of different
-size
-
-diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
---- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
-@@ -1,3 +1,4 @@
-+#define _XOPEN_SOURCE
- #define PWBUFSZ 256 /***SWB***/
- 
- /* MODULE: auth_shadow */
diff --git a/testing/libsasl/0016_pid_file_lock_creation_mask.patch b/testing/libsasl/0016_pid_file_lock_creation_mask.patch
deleted file mode 100644
index e9170cef3..000000000
--- a/testing/libsasl/0016_pid_file_lock_creation_mask.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
-
-pid_file_lock is created with a mask of 644 instead of 0644.
-This patch fixes this octal/decimal confusion as well as the
-(harmless) one in the previous umask() call.
-
-diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
---- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
-@@ -276,7 +276,7 @@
- 		exit(1);
- 	}
- 
--	umask(077);
-+	umask(0077);
- 
- 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
- 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
-@@ -287,7 +287,7 @@
- 	strlcpy(pid_file_lock, run_path, pid_file_size);
- 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
- 
--	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
-+	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
- 		rc = errno;
- 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
- 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/testing/libsasl/0018_auth_rimap_quotes.patch b/testing/libsasl/0018_auth_rimap_quotes.patch
deleted file mode 100644
index 13fa999f0..000000000
--- a/testing/libsasl/0018_auth_rimap_quotes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
-
-All lines beginning with `## DP:' are a description of the patch.
-Avoid infinite loop when username/password has a double quote character.
-Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
-
-diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
---- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
-+++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
-@@ -162,6 +162,7 @@
-     num_quotes = 0;
-     p1 = s;
-     while ((p1 = strchr(p1, '"')) != NULL) {
-+	p1++;
- 	num_quotes++;
-     }
-     
-@@ -438,7 +439,7 @@
- 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
- 	memset(qlogin, 0, strlen(qlogin));
- 	free(qlogin);
--	memset(qpass, 0, strlen(qlogin));
-+	memset(qpass, 0, strlen(qpass));
- 	free(qpass);
- 	(void)close(s);
- 	return strdup(RESP_IERROR);
-@@ -447,7 +448,7 @@
-     /* don't need these any longer */
-     memset(qlogin, 0, strlen(qlogin));
-     free(qlogin);
--    memset(qpass, 0, strlen(qlogin));
-+    memset(qpass, 0, strlen(qpass));
-     free(qpass);
- 
-     /* read and parse the LOGIN response */
diff --git a/testing/libsasl/0019_ldap_deprecated.patch b/testing/libsasl/0019_ldap_deprecated.patch
deleted file mode 100644
index 8825256cb..000000000
--- a/testing/libsasl/0019_ldap_deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
-
-The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
-Therefore, its prototype is not included by default when compiling
-against the ldap.h headers. As a result, the compiler cannot know the
-return type of the function at compile time, and will implicitly
-convert to a pointer. This has implications on 64-bit systems.
-This patch sets the deprecation mode on, so that the function prototype
-gets included when compiling.
-(Description by Fabian Fagerholm <fabbe@debian.org>)
-
-diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
---- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
-+++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
-@@ -55,6 +55,7 @@
- #include <openssl/des.h>
- #endif
- 
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #include <lber.h>
- #include <sasl.h>
diff --git a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch
deleted file mode 100644
index a49b553f0..000000000
--- a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
-
-The #elif preprocessor directive requires a test condition.
-GCC 4.4 enforces this rule.
-
-diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
---- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
-+++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
-@@ -2715,7 +2715,7 @@
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4034,7 +4034,7 @@
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,
diff --git a/testing/libsasl/0025_ld_as_needed.patch b/testing/libsasl/0025_ld_as_needed.patch
deleted file mode 100644
index 67b48b4a4..000000000
--- a/testing/libsasl/0025_ld_as_needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- 
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
diff --git a/testing/libsasl/0026_drop_krb5support_dependency.patch b/testing/libsasl/0026_drop_krb5support_dependency.patch
deleted file mode 100644
index cc00867ef..000000000
--- a/testing/libsasl/0026_drop_krb5support_dependency.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Roberto C. Sanchez <roberto@connexer.com>
-Description: Drop gratuitous dependency on krb5support
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
-   fi
- 
-   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
--    # check for libkrb5support first
--    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
--
-     gss_failed=0
-     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/testing/libsasl/0027_db5_support.patch b/testing/libsasl/0027_db5_support.patch
deleted file mode 100644
index 522824074..000000000
--- a/testing/libsasl/0027_db5_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ondřej Surý <ondrej@debian.org>
-Description: Support newer Berkeley DB versions
---- a/sasldb/db_berkeley.c
-+++ b/sasldb/db_berkeley.c
-@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
---- a/utils/dbconverter-2.c
-+++ b/utils/dbconverter-2.c
-@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
deleted file mode 100644
index 14a322496..000000000
--- a/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/lib/dlopen.c
-+++ b/lib/dlopen.c
-@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
-     return result;
- }
- 
--/* this returns the file to actually open.
-- *  out should be a buffer of size PATH_MAX
-- *  and may be the same as in. */
--
--/* We'll use a static buffer for speed unless someone complains */
--#define MAX_LINE 2048
--
--static int _parse_la(const char *prefix, const char *in, char *out) 
--{
--    FILE *file;
--    size_t length;
--    char line[MAX_LINE];
--    char *ntmp = NULL;
--
--    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
--
--    /* Set this so we can detect failure */
--    *out = '\0';
--
--    length = strlen(in);
--
--    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
--	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
--	    /* check for a .la file */
--	    strcpy(line, prefix);
--	    strcat(line, in);
--	    length = strlen(line);
--	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
--	    strcat(line, LA_SUFFIX);
--	    file = fopen(line, "r");
--	    if(file) {
--		/* We'll get it on the .la open */
--		fclose(file);
--		return SASL_FAIL;
--	    }
--	}
--	strcpy(out, prefix);
--	strcat(out, in);
--	return SASL_OK;
--    }
--
--    strcpy(line, prefix);
--    strcat(line, in);
--
--    file = fopen(line, "r");
--    if(!file) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "unable to open LA file: %s", line);
--	return SASL_FAIL;
--    }
--    
--    while(!feof(file)) {
--	if(!fgets(line, MAX_LINE, file)) break;
--	if(line[strlen(line) - 1] != '\n') {
--	    _sasl_log(NULL, SASL_LOG_WARN,
--		      "LA file has too long of a line: %s", in);
--	    return SASL_BUFOVER;
--	}
--	if(line[0] == '\n' || line[0] == '#') continue;
--	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
--	    /* We found the line with the name in it */
--	    char *end;
--	    char *start;
--	    size_t len;
--	    end = strrchr(line, '\'');
--	    if(!end) continue;
--	    start = &line[sizeof("dlname=")-1];
--	    len = strlen(start);
--	    if(len > 3 && start[0] == '\'') {
--		ntmp=&start[1];
--		*end='\0';
--		/* Do we have dlname="" ? */
--		if(ntmp == end) {
--		    _sasl_log(NULL, SASL_LOG_DEBUG,
--			      "dlname is empty in .la file: %s", in);
--		    return SASL_FAIL;
--		}
--		strcpy(out, prefix);
--		strcat(out, ntmp);
--	    }
--	    break;
--	}
--    }
--    if(ferror(file) || feof(file)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Error reading .la: %s\n", in);
--	fclose(file);
--	return SASL_FAIL;
--    }
--    fclose(file);
--
--    if(!(*out)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Could not find a dlname line in .la file: %s", in);
--	return SASL_FAIL;
--    }
--
--    return SASL_OK;
--}
- #endif /* DO_DLOPEN */
- 
- /* loads a plugin library */
-@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
- 		if (length + pos>=PATH_MAX) continue; /* too big */
- 
- 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
--			   SO_SUFFIX)
--		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
--			   LA_SUFFIX))
-+			   SO_SUFFIX))
- 		    continue;
- 
-+		/* We only use .so files for loading plugins */
-+
- 		memcpy(name,dir->d_name,length);
- 		name[length]='\0';
- 
--		result = _parse_la(prefix, name, tmp);
--		if(result != SASL_OK)
--		    continue;
--		
-+		/* Create full name with path */
-+		strncpy(tmp, prefix, PATH_MAX);
-+		strncat(tmp, name, PATH_MAX);
-+
- 		/* skip "lib" and cut off suffix --
- 		   this only need be approximate */
- 		strcpy(plugname, name + 3);
diff --git a/testing/libsasl/PKGBUILD b/testing/libsasl/PKGBUILD
deleted file mode 100644
index 27bde231b..000000000
--- a/testing/libsasl/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# $Id: PKGBUILD 146345 2012-01-09 18:52:43Z stephane $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-# This package spans multiple repositories.
-# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
-
-#pkgbase=('cyrus-sasl')
-#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
-pkgname=libsasl
-pkgver=2.1.23
-pkgrel=9
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/"
-license=('custom')
-options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-        cyrus-sasl-2.1.19-checkpw.c.patch
-        cyrus-sasl-2.1.22-crypt.patch
-        cyrus-sasl-2.1.22-qa.patch
-        cyrus-sasl-2.1.22-automake-1.10.patch
-        cyrus-sasl-2.1.23-authd-fix.patch
-        0003_saslauthd_mdoc.patch
-        0010_maintainer_mode.patch
-        0011_saslauthd_ac_prog_libtool.patch
-        0012_xopen_crypt_prototype.patch
-        0016_pid_file_lock_creation_mask.patch
-        0018_auth_rimap_quotes.patch
-        0019_ldap_deprecated.patch
-        0022_gcc4.4_preprocessor_syntax.patch
-        0025_ld_as_needed.patch
-        0026_drop_krb5support_dependency.patch
-        0027_db5_support.patch
-        0030-dont_use_la_files_for_opening_plugins.patch
-        saslauthd.conf.d
-        saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
-         '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
-         'f45d8b60e8f74dd7f7c2ec1665fa602a'
-         '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
-         '62bf892fe4d1df41ff748e91a1afaf67'
-         'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
-         '8e7106f32e495e9ade69014fd1b3352a'
-         '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20')
-
-build() {
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
-  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
-  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
-  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
-  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
-  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
-  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I cmulocal
-  automake -a -c
-  autoheader
-  autoconf
-
-  pushd saslauthd
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I ../cmulocal -I ../config
-  automake -a -c
-  autoheader
-  autoconf
-  popd
-
-  ./configure --prefix=/usr \
-      --mandir=/usr/share/man \
-      --infodir=/usr/share/info \
-      --disable-static \
-      --enable-shared \
-      --enable-alwaystrue \
-      --enable-checkapop \
-      --enable-cram \
-      --enable-digest \
-      --disable-otp \
-      --disable-srp \
-      --disable-srp-setpass \
-      --disable-krb4 \
-      --enable-gssapi \
-      --enable-auth-sasldb \
-      --enable-plain \
-      --enable-anon \
-      --enable-login \
-      --enable-ntlm \
-      --disable-passdss \
-      --enable-sql \
-      --enable-ldapdb \
-      --disable-macos-framework \
-      --with-pam \
-      --with-saslauthd=/var/run/saslauthd \
-      --with-ldap \
-      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-      --sysconfdir=/etc \
-      --with-devrandom=/dev/urandom
-  make
-}
-
-package_libsasl() {
-  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl')
-  conflicts=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  for dir in include lib sasldb plugins utils; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
-  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
-}
-
-package_cyrus-sasl() {
-  depends=("libsasl=${pkgver}-${pkgrel}")
-  pkgdesc="Cyrus saslauthd SASL authentication daemon"
-  backup=('etc/conf.d/saslauthd')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/etc/conf.d"
-  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
-}
-
-package_cyrus-sasl-gssapi() {
-  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
-}
-
-package_cyrus-sasl-ldap() {
-  pkgdesc="ldapdb auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
-}
-
-package_cyrus-sasl-sql() {
-  pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
-}
diff --git a/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
deleted file mode 100644
index f7bf44b79..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
-+++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
-@@ -120,7 +120,7 @@
- JAVA_TRUE = @JAVA_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = -lcrypt @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
-+++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
-@@ -94,6 +94,23 @@
- # endif
- #endif
- 
-+/******************************
-+ * crypt(3) patch start       *
-+ ******************************/
-+char *crypt(const char *key, const char *salt);
-+
-+/* cleartext password formats */
-+#define PASSWORD_FORMAT_CLEARTEXT 1
-+#define PASSWORD_FORMAT_CRYPT 2
-+#define PASSWORD_FORMAT_CRYPTTRAD 3
-+#define PASSWORD_SALT_BUF_LEN 22
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format);
-+
-+/******************************
-+ * crypt(3) patch stop        *
-+ ******************************/
- 
- /* we store the following secret to check plaintext passwords:
-  *
-@@ -143,7 +160,51 @@
- 				       "*cmusaslsecretPLAIN",
- 				       NULL };
-     struct propval auxprop_values[3];
--    
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 * for password format check  *
-+	 ******************************/
-+    sasl_getopt_t *getopt;
-+    void *context;
-+    const char *p = NULL;
-+	/**
-+	 * MD5: 12 char salt
-+	 * BLOWFISH: 16 char salt
-+	 */
-+	char salt[PASSWORD_SALT_BUF_LEN];
-+	int password_format;
-+
-+	/* get password format from auxprop configuration */
-+	if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
-+		getopt(context, NULL, "password_format", &p, NULL);
-+	}
-+
-+	/* set password format */
-+	if (p) {
-+		/*
-+		memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
-+		strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
-+		*/
-+		/* modern, modular crypt(3) */
-+		if (strncmp(p, "crypt", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPT;
-+		/* traditional crypt(3) */
-+		else if (strncmp(p, "crypt_trad", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPTTRAD;
-+		/* cleartext password */
-+		else
-+			password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	} else {
-+		/* cleartext password */
-+		password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	}
-+
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 * for password format check  *
-+	 ******************************/
-+
-     if (!conn || !userstr)
- 	return SASL_BADPARAM;
- 
-@@ -180,14 +241,31 @@
- 	goto done;
-     }
- 
--    /* At the point this has been called, the username has been canonified
--     * and we've done the auxprop lookup.  This should be easy. */
--    if(auxprop_values[0].name
--       && auxprop_values[0].values
--       && auxprop_values[0].values[0]
--       && !strcmp(auxprop_values[0].values[0], passwd)) {
--	/* We have a plaintext version and it matched! */
--	return SASL_OK;
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 ******************************/	
-+
-+	/* get salt */
-+	_sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
-+	
-+	/* crypt(3)-ed password? */
-+	if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare password */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	}
-+	else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare passwords */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 ******************************/
-     } else if(auxprop_values[1].name
- 	      && auxprop_values[1].values
- 	      && auxprop_values[1].values[0]) {
-@@ -975,3 +1053,37 @@
- #endif     
-     { NULL, NULL }
- };
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format) {
-+	int num;	/* how many characters is salt long? */
-+	switch (format) {
-+		case PASSWORD_FORMAT_CRYPT:
-+			/* md5 crypt */
-+			if (src[1] == '1')
-+				num = 12;
-+			/* blowfish crypt */
-+			else if (src[1] == '2')
-+				num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
-+			/* traditional crypt */
-+			else
-+				num = 2;
-+			break;
-+	
-+		case PASSWORD_FORMAT_CRYPTTRAD:
-+			num = 2;
-+			break;
-+
-+		default:
-+			return 1;
-+	}
-+
-+	/* destroy destination */
-+	memset(dest, '\0', (num + 1));
-+
-+	/* copy salt to destination */
-+	strncpy(dest, src, num);
-+
-+	return 1;
-+}
-+
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch
deleted file mode 100644
index 1294cb507..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
-+++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
-@@ -77,7 +77,7 @@
-   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
-   SASL_DB_PATH_CHECK()
-   SASL_DB_CHECK()
--  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
- fi
- 
- AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
deleted file mode 100644
index 8cd71c0c5..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
-originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
-using automake 1.10.
-
---- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
-@@ -82,73 +82,73 @@
- 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
- 
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
--libplain_la_LDFLAGS = -version-info $(plain_version)
-+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
- libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
--libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
-+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
- libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
- libanonymous_la_LIBADD = $(COMPAT_OBJS)
- 
- libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
--libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
-+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
- libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
- libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
--libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
-+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
- libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
- libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
--libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
-+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
- libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libcrammd5_la_LIBADD = $(COMPAT_OBJS)
- 
- libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
--libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
-+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
- libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- liblogin_la_SOURCES = login.c login_init.c $(common_sources)
--liblogin_la_LDFLAGS = -version-info $(login_version)
-+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
- liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
- liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
--libsrp_la_LDFLAGS = -version-info $(srp_version)
-+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
- libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
- 
- libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
--libotp_la_LDFLAGS = -version-info $(otp_version)
-+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
- libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
- 
- libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
--libntlm_la_LDFLAGS = -version-info $(ntlm_version)
-+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
- libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
- libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
- 
- libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
--libpassdss_la_LDFLAGS = -version-info $(passdss_version)
-+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
- libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
- libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
- 
- # Auxprop Plugins
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
--libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
-+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
- 
- libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
--libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
-+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
- libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
- 
- libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
-+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
- libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsql_la_LIBADD = $(COMPAT_OBJS)
- 
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch b/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch
deleted file mode 100644
index fd356327b..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://bugs.gentoo.org/152544
-
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -45,6 +45,7 @@ sasl_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
- noinst_LIBRARIES = @SASL_STATIC_LIBS@
---- cyrus-sasl-2.1.22/plugins/Makefile.am
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am
-@@ -63,6 +63,7 @@ srp_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
-+AM_CFLAGS = -fPIC
- 
- COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
- 
---- cyrus-sasl-2.1.22/sasldb/Makefile.am
-+++ cyrus-sasl-2.1.22/sasldb/Makefile.am
-@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
- 
- extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = NTMakefile
- 
- noinst_LTLIBRARIES = libsasldb.la
---- cyrus-sasl-2.1.22/utils/Makefile.am
-+++ cyrus-sasl-2.1.22/utils/Makefile.am
-@@ -42,7 +42,7 @@
- #
- ################################################################
- 
--all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
-+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
- all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
- 
- sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
---- cyrus-sasl-2.1.22/sample/Makefile.am
-+++ cyrus-sasl-2.1.22/sample/Makefile.am
-@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
- server_SOURCES = server.c common.c common.h
- client_SOURCES = client.c common.c common.h
- 
--server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
--sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
- EXTRA_DIST = NTMakefile
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
- libsasl2_la_SOURCES = $(common_sources) $(common_headers)
- libsasl2_la_LDFLAGS = -version-info $(sasl_version)
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
--libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
-+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-qa.patch b/testing/libsasl/cyrus-sasl-2.1.22-qa.patch
deleted file mode 100644
index 4f7b04f13..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-qa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix missing prototype warnings
-
---- cyrus-sasl-2.1.22/lib/auxprop.c
-+++ cyrus-sasl-2.1.22/lib/auxprop.c
-@@ -43,6 +43,7 @@
-  */
- 
- #include <config.h>
-+#include <stdio.h>
- #include <sasl.h>
- #include <prop.h>
- #include <ctype.h>
---- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
- ******************************************************************/
- 
- #include <shadow.h>
-+#include <string.h>
- 
- extern char *crypt();
- 
diff --git a/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
deleted file mode 100644
index f5f372d17..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-fix warnings:
-
-auth_sasldb.c: In function ‘auth_sasldb’:
-auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
-
-auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
-../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
-
---- saslauthd/auth_sasldb.c
-+++ saslauthd/auth_sasldb.c
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <pwd.h>
-+#include <unistd.h>
- /* END PUBLIC DEPENDENCIES */
- 
- #define RETURN(x) return strdup(x)
-@@ -131,7 +132,8 @@
-     /* VARIABLES */
-     char pw[1024];			/* pointer to passwd file entry */
-     sasl_utils_t utils;
--    int ret, outsize;
-+    int ret;
-+    size_t outsize;
-     const char *use_realm;
-     char realm_buf[MAXHOSTNAMELEN];
-     /* END VARIABLES */
diff --git a/testing/libsasl/saslauthd b/testing/libsasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/testing/libsasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
-    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
-      add_daemon $DAEMON_NAME
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon $DAEMON_NAME
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/libsasl/saslauthd.conf.d b/testing/libsasl/saslauthd.conf.d
deleted file mode 100644
index 167211290..000000000
--- a/testing/libsasl/saslauthd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SASLAUTHD_OPTS="-a pam"
diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD
deleted file mode 100644
index f973a828a..000000000
--- a/testing/libxcb/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 146773 2012-01-17 13:02:00Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.8
-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=('18b76759d5bbb863777f37bf3aec23ebaa31d5be'
-          '3455e84642283bc91c8313af319002a20bbcbdf4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index f17de1b1d..000000000
--- a/testing/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/testing/linux-lts/PKGBUILD b/testing/linux-lts/PKGBUILD
deleted file mode 100644
index b260ef290..000000000
--- a/testing/linux-lts/PKGBUILD
+++ /dev/null
@@ -1,273 +0,0 @@
-# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-
-pkgbase=linux-lts
-pkgname=('linux-lts' 'linux-lts-headers') # Build stock -ARCH kernel
-# pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux}
-_basekernel=3.0
-pkgver=${_basekernel}.17
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.kernel.org/"
-license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
-options=('!strip')
-source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.0.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
-        # the main kernel config files
-        'config' 'config.x86_64'
-        # standard config files for mkinitcpio ramdisk
-        "${pkgname}.preset"
-        'change-default-console-loglevel.patch'
-        'i915-fix-ghost-tv-output.patch')
-md5sums=('ecf932280e2441bdd992423ef3d55f8f'
-         'e86da20888dfcd19b94f5d518329ca25'
-         '516780158b2dcf6791edc062674a1e7a'
-         '5fee953e4746c31eb7ce8890ce2d24de'
-         '21a33df5fba2da2f56e447fb171f02c0'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '263725f20c0b9eb9c353040792d644e5')
-
-build() {
-  cd "${srcdir}/linux-${_basekernel}"
-
-  # add upstream patch
-  patch -p1 -i "${srcdir}/patch-${pkgver}"
-
-  # add latest fixes from stable queue, if needed
-  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-
-  # 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"
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    cat "${srcdir}/config.x86_64" > ./.config
-  else
-    cat "${srcdir}/config" > ./.config
-  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!
-  make ${MAKEFLAGS} bzImage modules
-}
-
-package_linux-lts() {
-  pkgdesc="The Linux Kernel and modules - stable longtime supported kernel package suitable for servers"
-  depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
-  optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26-lts')
-  conflicts=('kernel26-lts')
-  replaces=('kernel26-lts' 'nouveau-drm-lts')
-  backup=("etc/mkinitcpio.d/${pkgname}.preset")
-  install=${pkgname}.install
-
-  cd "${srcdir}/linux-${_basekernel}"
-
-  KARCH=x86
-
-  # get kernel version
-  _kernver="$(make kernelrelease)"
-
-  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
-  make INSTALL_MOD_PATH="${pkgdir}" modules_install
-  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
-
-  # 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"
-
-  # 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:--ARCH}" "${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:--ARCH}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
-}
-
-package_linux-lts-headers() {
-  pkgdesc="Header files and scripts for building modules for linux longtime supported kernel"
-  provides=('kernel26-lts-headers')
-  conflicts=('kernel26-lts-headers')
-  replaces=('kernel26-lts-headers')
-
-  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/x86"
-  cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/"
-
-  # copy files necessary for later builds, like nvidia and vmware
-  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
-
-  # 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,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
-}
diff --git a/testing/linux-lts/change-default-console-loglevel.patch b/testing/linux-lts/change-default-console-loglevel.patch
deleted file mode 100644
index 63435d84f..000000000
--- a/testing/linux-lts/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/testing/linux-lts/config b/testing/linux-lts/config
deleted file mode 100644
index 5ce7bab60..000000000
--- a/testing/linux-lts/config
+++ /dev/null
@@ -1,5832 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.17 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_HAVE_CPUMASK_OF_CPU_MAP is not set
-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="-ARCH"
-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_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
-
-#
-# 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_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=y
-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_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
-
-#
-# 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_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=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-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_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_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_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_IOMMU_API=y
-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_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=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-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_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-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=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
-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=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
-CONFIG_ACPI_APEI_PCIEAER=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_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-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_IOV=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=m
-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_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-CONFIG_RAPIDIO_DEBUG=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=m
-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_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_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
-
-#
-# 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_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-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=y
-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_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_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_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_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_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
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
-# 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_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-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_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-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_LOOPBACK_TARGET_CDB_DEBUG is not set
-CONFIG_TCM_FC=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_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_MII=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_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
-CONFIG_DNET=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_AT1700=m
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=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_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-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_B43=m
-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_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_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_IWLAGN=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=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_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_HT=y
-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
-
-#
-# 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
-
-#
-# 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_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN 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
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=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_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_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_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-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_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_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_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
-
-#
-# 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_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=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_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_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_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_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=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_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=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_SCH5627=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_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=m
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
-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_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_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_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_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_LIRC_CODEC=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_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_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_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=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_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_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=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_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_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_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_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_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_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_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 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
-
-#
-# 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
-
-#
-# 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_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=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_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=m
-# 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=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-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=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I810=m
-# CONFIG_FB_I810_GTF is not set
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# 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_UDL=m
-# CONFIG_FB_VIRTUAL is not set
-# 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_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=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_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_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-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_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_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_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_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_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_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_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_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=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_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_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=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_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_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=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_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_OF=m
-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_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_GPIO_OF=y
-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_IDE_DISK=y
-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_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
-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_MCE=y
-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_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-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_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=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_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
-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_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_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_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-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_VMWGFX=m
-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=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
-CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_CS5535_GPIO=m
-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_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=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_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
-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
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=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_CLKSRC_I8253=y
-
-#
-# 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=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-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_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# 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_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_DEPRECATED is not set
-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_SPINLOCK_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_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_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_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_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=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_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_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
diff --git a/testing/linux-lts/config.x86_64 b/testing/linux-lts/config.x86_64
deleted file mode 100644
index 55761471c..000000000
--- a/testing/linux-lts/config.x86_64
+++ /dev/null
@@ -1,5571 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.17 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_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_HAVE_CPUMASK_OF_CPU_MAP=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="-ARCH"
-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_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
-
-#
-# 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_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=y
-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_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
-
-#
-# 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_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=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-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_SMP=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_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_XEN_DEBUG 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_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_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=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_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=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-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_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-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=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
-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=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
-CONFIG_ACPI_APEI_PCIEAER=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_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_INTR_REMAP 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_IOV=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_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-CONFIG_RAPIDIO_DEBUG=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=m
-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_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_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
-
-#
-# 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_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-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_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_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_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_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
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
-# 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_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-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_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-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_LOOPBACK_TARGET_CDB_DEBUG is not set
-CONFIG_TCM_FC=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_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_MII=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_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_DNET=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_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=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_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-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_B43=m
-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_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_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_IWLAGN=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=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_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_HT=y
-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
-
-#
-# 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
-
-#
-# 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_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN 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
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=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_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_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-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_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_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
-
-#
-# 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_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=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_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_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_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=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_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=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_SCH5627=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_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=m
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
-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_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_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_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_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_LIRC_CODEC=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_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_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_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=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_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_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=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_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_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_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_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_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_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_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 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
-
-#
-# 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
-
-#
-# 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_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=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_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=m
-# 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=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-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=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# 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_UDL=m
-# CONFIG_FB_VIRTUAL is not set
-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_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=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_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_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-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_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_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_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_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_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_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_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_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=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_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_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=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_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_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=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_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_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-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_IDE_DISK=y
-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_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
-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_MCE=y
-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_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
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=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_XEN_PLATFORM_PCI=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-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_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=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_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
-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_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_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_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-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_VMWGFX=m
-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=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=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_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=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_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
-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
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=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
-
-#
-# 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=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-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_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# 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_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_DEPRECATED is not set
-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_SPINLOCK_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_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_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
-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_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
-
-#
-# 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_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_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=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_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_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
diff --git a/testing/linux-lts/i915-fix-ghost-tv-output.patch b/testing/linux-lts/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/testing/linux-lts/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/testing/linux-lts/linux-lts.install b/testing/linux-lts/linux-lts.install
deleted file mode 100644
index 00c9ff692..000000000
--- a/testing/linux-lts/linux-lts.install
+++ /dev/null
@@ -1,62 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.17-1-lts
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
-
-  # 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${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux${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}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img
-}
diff --git a/testing/linux-lts/linux-lts.preset b/testing/linux-lts/linux-lts.preset
deleted file mode 100644
index fae522f39..000000000
--- a/testing/linux-lts/linux-lts.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-lts"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-lts.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-fallback-lts.img" 
-fallback_options="-S autodetect"
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
deleted file mode 100644
index c5988c0fb..000000000
--- a/testing/lirc/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 146228 2012-01-06 12:04:39Z ibiru $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=10
-epoch=1
-_extramodules=extramodules-3.2-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-        lirc_wpc8769l.patch
-        lircd-handle-large-config.patch
-        lirc_atiusb-kfifo.patch
-        kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-      -e 's/@X_LIBS@//g' \
-      -e 's/@X_PRE_LIBS@//g' \
-      -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-      --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-      --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-      -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-      -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
-      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
-  make
-}
-
-package_lirc() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.2' 'linux<3.3')
-  replaces=('lirc+pctv')
-  install=lirc.install
-
-  cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
-
-  # set the kernel we've built for inside the install script
-  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
-  # gzip -9 modules
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_lirc-utils() {
-  pkgdesc="Linux Infrared Remote Control utils"
-  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
-  optdepends=('python2: pronto2lirc utility')
-  options=('strip' '!libtool')
-  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
-
-  cd "${srcdir}/lirc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
-  cp -rp remotes "${pkgdir}/usr/share/lirc"
-  chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
-  # install the logrotate config
-  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-    
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
-  install -d "${pkgdir}/etc/lirc"
-  
-  # remove built modules
-  rm -r "${pkgdir}/lib/"
-}
diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/testing/lirc/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
\ No newline at end of file
diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd
deleted file mode 100755
index a64b033a5..000000000
--- a/testing/lirc/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
-  start)
-    stat_busy "Starting IREXEC Daemon"
-    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon irexecd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IREXEC Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irexecd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch
deleted file mode 100644
index 7353d61ca..000000000
--- a/testing/lirc/kernel-2.6.39.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
-@@ -555,8 +555,8 @@
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
-@@ -361,14 +361,14 @@
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
--		next_one = generic_find_next_le_bit(ldata, size, 0);
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
--			next_zero = generic_find_next_zero_le_bit(ldata,
-+			next_zero = find_next_zero_bit_le(ldata,
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +376,7 @@
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
--				next_one = generic_find_next_le_bit(ldata,
-+				next_one = find_next_bit_le(ldata,
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install
deleted file mode 100644
index 9bf905742..000000000
--- a/testing/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.2-ARCH
-
-post_install() {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install
-}
-
-# arg 1:  the old package version
-post_remove() {
-  post_install
-}
diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate
deleted file mode 100644
index 623c4f328..000000000
--- a/testing/lirc/lirc.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch
deleted file mode 100644
index a64984dce..000000000
--- a/testing/lirc/lirc_atiusb-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- 		goto new_irctl_failure_check;
- 	}
- 
--	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
--- 
-1.7.0.1
-
diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch
deleted file mode 100644
index e4e2a049b..000000000
--- a/testing/lirc/lirc_wpc8769l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- 	/* Reset last timeout value. */
- 	lastus = 0;
- 
--	/* Init the read buffer. */
--	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
--		return -ENOMEM;
--
- 	/* Acquire the IRQ. */
- 	result = request_irq(irq, irq_handler,
- 			   IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- 	/* Free the IRQ. */
- 	free_irq(irq, THIS_MODULE);
- 	dprintk("Freed IRQ %d\n", irq);
--
--	/* Free the RX buffer. */
--	lirc_buffer_free(&rbuf);
- }
- 
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- 	/* Do load-time checks. */
- 	wpc8769l_power_up_and_check_if_we_woke_us_up();
- 
-+	/* Init the read buffer. */
-+	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+		rc = -ENOMEM;
-+		goto exit_platform_exit;
-+	}
-+
- 	/* Configure the driver hooks. */
- 	driver.features = LIRC_CAN_REC_MODE2;
-+	driver.dev = &lirc_wpc8769l_platform_dev->dev;
- 	driver.minor = lirc_register_driver(&driver);
- 	if (driver.minor < 0) {
- 		eprintk("lirc_register_driver failed!\n");
- 		rc = -EIO;
--		goto exit_platform_exit;
-+		goto exit_release_buffer;
- 	}
- 
- 	iprintk("Driver loaded.\n");
- 
- 	return 0; /* Everything OK. */
- 
-+exit_release_buffer:
-+	lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- 	lirc_wpc8769l_platform_exit();
- 
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
- 
- static void __exit lirc_wpc8769l_module_exit(void)
- {
--	/* Unregister the platform driver and device. */
--	lirc_wpc8769l_platform_exit();
--
- 	/* Unregister the LIRC driver. */
- 	lirc_unregister_driver(driver.minor);
- 
-+	/* Free the buffer. */
-+	lirc_buffer_free(&rbuf);
-+
-+	/* Unregister the platform driver and device. */
-+	lirc_wpc8769l_platform_exit();
-+
- 	/* Release the second range. */
- 	if (baseport2)
- 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
--- 
-1.7.0.1
-
diff --git a/testing/lirc/lircd b/testing/lirc/lircd
deleted file mode 100755
index e9739b36e..000000000
--- a/testing/lirc/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
-  start)
-    stat_busy "Starting LIRC Daemon"
-   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
-    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
-    if [ $? -ne 0 ]; then
-      stat_fail
-      exit 0
-    fi
-    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && 
-      if [ -n "$LIRC_DEVICE" ] ; then
-        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      else
-        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LIRC Daemon"
-    rm -f $LIRCD_SYMLINKFILE
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch
deleted file mode 100644
index 85bc20518..000000000
--- a/testing/lirc/lircd-handle-large-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH] lircd: handle larger config files in write_socket better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c |    8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- 	int done, todo = len;
- 
- 	while (todo) {
--#ifdef SIM_REC
- 		do {
- 			done = write(fd, buf, todo);
--		}
--		while (done < 0 && errno == EAGAIN);
--#else
--		done = write(fd, buf, todo);
--#endif
-+		} while (done < 0 && errno == EAGAIN);
-+
- 		if (done <= 0)
- 			return (done);
- 		buf += done;
--- 
-1.7.0.1
-
diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/testing/lirc/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd
deleted file mode 100755
index 220c47c9c..000000000
--- a/testing/lirc/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
-  start)
-    stat_busy "Starting lircmd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lircmd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lircmd Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mail-notification/PKGBUILD b/testing/mail-notification/PKGBUILD
deleted file mode 100644
index 1ed5fa7f0..000000000
--- a/testing/mail-notification/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 146622 2012-01-14 12:24:17Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=mail-notification
-pkgver=5.4
-pkgrel=10
-pkgdesc="Tray icon application that informs you if you have new mail"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/mailnotify/"
-license=('GPL3' 'FDL')
-depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
-makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2')
-options=('!libtool' '!emptydirs')
-install=mail-notification.install
-source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2
-        dont-update-cache.patch
-        remove-ubuntu-special-case.patch
-        mail-notification-5.4-evolution.patch
-        mail-notification-5.4-sasl_encode64.patch
-        mail-notification-5.4-evolution-gtkhtml.patch
-        mail-notification-5.4-camel_headers.patch
-        mail-notification-5.4-icons.patch
-        mail-notification-5.4-weak.patch
-        mail-notification-5.4-popup-attach.patch
-        mail-notification-5.4-kde-trayicon.patch
-        mail-notification-5.4-evolution-3-0-support.patch
-        mail-notification-5.4-gtk3-support.patch
-        mail-notification-5.4-add-fallback-icon.patch
-        mail-notification-5.4-gmime.patch
-        mail-notification-5.4-libx11.patch)
-md5sums=('c8dc33a61251acb5474e56eab6b18f43'
-         '6007bc30e789dab0a8282038e0335eb9'
-         '9cadd61bbd9c324b2916ec980231e0f2'
-         'aa6f80820899f904c25988772f70ade9'
-         '125513ed059f62469377eb0ab794dbed'
-         'c595a3962ab13a65be24a941e28faa9c'
-         'f79939f593b2e8659e302df72c2b54b1'
-         '244b7ef2aec7656e8df390be87c10e2b'
-         '31bde95dfd39449959d8b3316f91429c'
-         'cdead6a88d1779f69a5f40dc75d5cb84'
-         'c7991b831834724eddc1c6802c3e06a6'
-         'b370b1085ebb2814bd5d345a6d2b45ea'
-         '1ba948759110787dd57097cff157b75a'
-         '09df61b4dc29c676ac81ff9054e840ac'
-         '0944695e9b9b30f39028f85c83c6a7e2'
-         'c3f643ef16aab3b4fe9ff5b333bff41a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/dont-update-cache.patch"
-  patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-icons.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-weak.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-popup-attach.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-kde-trayicon.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-gmime.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-libx11.patch"
-
-  gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui
-  gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui
-
-  ./jb configure prefix=/usr sysconfdir=/etc \
-      localstatedir=/var destdir="${pkgdir}" \
-      gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=no \
-      cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
-      library-mode=0755
-  ./jb build
-  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install
-
-  rm -f "${pkgdir}/usr/share/mail-notification/"*.glade
-  install -m644 ui/mailbox-properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
-  install -m644 ui/properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain mail-notification ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/mail-notification/dont-update-cache.patch b/testing/mail-notification/dont-update-cache.patch
deleted file mode 100644
index 81216835e..000000000
--- a/testing/mail-notification/dont-update-cache.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- jbsrc/jb.c.~1~	2008-03-20 16:53:02.000000000 +0100
-+++ jbsrc/jb.c	2008-03-26 20:51:45.641363619 +0100
-@@ -327,7 +327,6 @@
- jb_package_add_resources (void)
- {
-   JBGroup *group;
--  JBRule *rule;
-   JBObject *object;
- 
-   if (jb_variable_get_bool("compile-warnings"))
-@@ -362,11 +361,6 @@
-   if (jb_variable_get_bool("hotmail"))
-     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
- 
--  rule = jb_rule_new();
--  jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
--  jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
--  jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
--
-   jb_group_add(group);
- 
-   /*** data ******************************************************************/
diff --git a/testing/mail-notification/mail-notification-5.4-add-fallback-icon.patch b/testing/mail-notification/mail-notification-5.4-add-fallback-icon.patch
deleted file mode 100644
index 41c28e870..000000000
--- a/testing/mail-notification/mail-notification-5.4-add-fallback-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/mn-stock.c.orig	2011-02-17 17:42:39.886767087 +0100
-+++ src/mn-stock.c	2011-02-17 17:49:37.415541177 +0100
-@@ -86,6 +86,13 @@
- 	  gtk_icon_source_set_icon_name(icon_source, icons[i].icon_name);
- 	  gtk_icon_set_add_source(icon_set, icon_source);
- 	  gtk_icon_source_free(icon_source);
-+
-+          /* Add a fallback icon */
-+          icon_source = gtk_icon_source_new();
-+          gtk_icon_source_set_icon_name(icon_source, "mail-notification");
-+          gtk_icon_source_set_state_wildcarded(icon_source, TRUE);
-+          gtk_icon_set_add_source(icon_set, icon_source);
-+          gtk_icon_source_free(icon_source);
- 	}
-       else if (icons[i].source_stock_id)
- 	{
diff --git a/testing/mail-notification/mail-notification-5.4-camel_headers.patch b/testing/mail-notification/mail-notification-5.4-camel_headers.patch
deleted file mode 100644
index 861e3d215..000000000
--- a/testing/mail-notification/mail-notification-5.4-camel_headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-message.c mail-notification-5.4-OK/build/src/mn-evolution-message.c
---- mail-notification-5.4/build/src/mn-evolution-message.c	2008-05-22 19:47:51.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-message.c	2010-05-04 18:13:31.000000000 +0400
-@@ -25,7 +25,7 @@
- #line 24 "src/mn-evolution-message.gob"
- 
- #include <glib/gi18n.h>
--#include <camel/camel-folder-summary.h>
-+#include <camel/camel.h>
- #include "mn-evolution-mailbox.h"
- #include "mn-message-private.h"
- #include "mn-evolution-client.h"
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
---- mail-notification-5.4/build/src/mn-evolution-server.c	2010-05-04 18:12:56.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-05-04 18:13:39.000000000 +0400
-@@ -28,7 +28,7 @@
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
- #include <libedataserver/eds-version.h>
--#include <camel/camel-folder.h>
-+#include <camel/camel.h>
- #if EDS_CHECK_VERSION(2,29,0)
- #include <shell/e-shell.h>
- #include <mail/e-mail-browser.h>
-diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
---- mail-notification-5.4/src/mn-evolution-plugin.c	2010-05-04 18:12:56.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-05-04 18:13:20.000000000 +0400
-@@ -24,7 +24,7 @@
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
--#include <camel/camel-folder.h>
-+#include <camel/camel.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
diff --git a/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
deleted file mode 100644
index 51938b5fa..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30	2011-02-02 00:09:33.945696868 +0100
-+++ jbsrc/lib/src/extras/jb-evolution-plugin.c	2011-02-02 00:28:09.096275028 +0100
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-+  packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
-@@ -53,7 +53,7 @@
-       char *plugindir;
- 
-       jb_message_checking("for the Evolution plugin directory");
--      plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
-+      plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir");
-       jb_message_result_string(plugindir ? plugindir : "not found");
- 
-       if (! plugindir)
---- src/mn-evolution-plugin.c.orig	2011-02-09 00:07:37.422002566 +0100
-+++ src/mn-evolution-plugin.c	2011-02-09 00:12:43.652678682 +0100
-@@ -25,6 +25,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
- #include <camel/camel.h>
-+#include <libedataserver/eds-version.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
-@@ -240,7 +241,11 @@
- 					       EMEventTargetFolder *folder)
- {
-   if (evo_server)
-+#if EDS_CHECK_VERSION(3,1,0)
-+    mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name));
-+#else
-     mn_evolution_server_folder_changed(evo_server, folder->uri);
-+#endif
- }
- 
- void
-@@ -249,10 +250,16 @@
- {
-   if (evo_server)
-     {
--      char *url;
-+#if EDS_CHECK_VERSION(2,91,0)
-+      const char *url = camel_folder_get_uri(message->folder);
-+#else
-+      char *url = mail_tools_folder_to_url(message->folder);
-+#endif
-
--      url = mail_tools_folder_to_url(message->folder);
-       mn_evolution_server_message_reading(evo_server, url);
-+
-+#if !EDS_CHECK_VERSION(2,91,0)
-       g_free(url);
-+#endif
-     }
- }
---- build/src/mn-evolution-server.c.orig	2011-02-09 00:17:38.850944227 +0100
-+++ build/src/mn-evolution-server.c	2011-02-09 22:21:54.155346478 +0100
-@@ -496,11 +496,15 @@
- 
-     if (! folder)
-       {
--	folder = mail_tool_uri_to_folder(uri, 0,
- #if EDS_CHECK_VERSION(2,91,0)
--	      NULL,
-+        static EMailSession * session = NULL;
-+        if (!session)
-+          session = e_mail_session_new();
-+
-+        folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL);
-+#else
-+	folder = mail_tool_uri_to_folder(uri, 0, NULL);
- #endif
--	      NULL);
- 	if (folder)
- 	  self_cache_folder(uri, folder);
- 	else
-@@ -677,7 +681,12 @@
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(3,1,0)
-+	*ret = g_strdup(camel_folder_get_display_name(folder));
-+#else
- 	*ret = g_strdup(camel_folder_get_name(folder));
-+#endif
-+
- #if EDS_CHECK_VERSION(2,31,0)
- 	g_object_unref(folder);
- #else
-@@ -725,8 +734,12 @@
- 	shell = e_shell_get_default ();
- 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
- 
--	browser = e_mail_browser_new (shell_backend);
-+	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
-+#if EDS_CHECK_VERSION(3,1,0)
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
-+#else
- 	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+#endif
- 	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
- 	gtk_widget_show (browser);
- #else
---- build/src/mn-evolution-folder-tree-server.c.orig	2011-06-17 22:01:49.226886994 +0200
-+++ build/src/mn-evolution-folder-tree-server.c	2011-06-18 00:34:23.046889847 +0200
-@@ -444,7 +444,9 @@
- {
- #line 61 "src/mn-evolution-folder-tree-server.gob"
- 	
--#if EDS_CHECK_VERSION(2,91,0)
-+#if EDS_CHECK_VERSION(3,1,0)
-+    selfp->tree = em_folder_tree_new(NULL, NULL);
-+#elif EDS_CHECK_VERSION(2,91,0)
-     selfp->session = e_mail_session_new();
-     selfp->tree = em_folder_tree_new(selfp->session);
- #elif EDS_CHECK_VERSION(2,29,0)
diff --git a/testing/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch b/testing/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch
deleted file mode 100644
index 283ef36d6..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c
---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2008-04-27 18:47:43.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-08-21 19:48:22.000000000 +0400
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
diff --git a/testing/mail-notification/mail-notification-5.4-evolution.patch b/testing/mail-notification/mail-notification-5.4-evolution.patch
deleted file mode 100644
index 87514c22d..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c
---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c	2010-10-12 16:50:15.000000000 +0400
-@@ -25,7 +25,10 @@
- #line 24 "src/mn-evolution-folder-tree-server.gob"
- 
- #include <dbus/dbus.h>
-+#include <libedataserver/eds-version.h>
-+#if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-+#endif
- #include <mail/em-folder-tree.h>
- #include "mn-evolution-plugin.h"
- #include "mn-evolution.h"
-@@ -441,10 +444,17 @@
- {
- #line 61 "src/mn-evolution-folder-tree-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,91,0)
-+    selfp->session = e_mail_session_new();
-+    selfp->tree = em_folder_tree_new(selfp->session);
-+#elif EDS_CHECK_VERSION(2,29,0)
-+    selfp->tree = em_folder_tree_new();
-+#else
-     EMFolderTreeModel *model;
- 
-     model = mail_component_peek_tree_model(mail_component_peek());
-     selfp->tree = em_folder_tree_new_with_model(model);
-+#endif
- 
-     selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
-     gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
-@@ -469,6 +479,10 @@
- {
- #line 80 "src/mn-evolution-folder-tree-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,91,0)
-+    g_object_unref(selfp->session);
-+    selfp->session = NULL;
-+#endif
-     g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self);
-   }}
- #line 475 "mn-evolution-folder-tree-server.c"
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
---- mail-notification-5.4/build/src/mn-evolution-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-10-12 16:50:40.000000000 +0400
-@@ -27,12 +27,22 @@
- #include <stdio.h>
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
-+#include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
-+#if EDS_CHECK_VERSION(2,29,0)
-+#include <shell/e-shell.h>
-+#include <mail/e-mail-browser.h>
-+#else
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
- #include <mail/em-message-browser.h>
-+#endif
- #include <mail/em-utils.h>
-+#if EDS_CHECK_VERSION(2,91,0)
-+#include <mail/e-mail-session.h>
-+#else
- #include <mail/mail-session.h>
-+#endif
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
- #include "mn-evolution-folder-tree-server.h"
-@@ -391,10 +397,18 @@
-     info = g_new0(FolderInfo, 1);
-     info->uri = g_strdup(uri);
-     info->folder = folder;
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_object_ref(folder);
-+#else
-     camel_object_ref(folder);
-+#endif
- 
-     /* uncache the folder when it is deleted */
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_signal_connect(folder, "deleted", G_CALLBACK(self_folder_deleted_cb), info);
-+#else
-     camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info);
-+#endif
- 
-     g_hash_table_replace(folders, info->uri, info);
-   }}
-@@ -413,8 +427,13 @@
- {
- #line 105 "src/mn-evolution-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_signal_handlers_disconnect_by_func(info->folder, self_folder_deleted_cb, info);
-+    g_object_unref(info->folder);
-+#else
-     camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info);
-     camel_object_unref(info->folder);
-+#endif
-     g_free(info->uri);
-     g_free(info);
-   }}
-@@ -461,7 +480,11 @@
- 	if (info)
- 	  {
- 	    folder = info->folder;
-+#if EDS_CHECK_VERSION(2,31,0)
-+	    g_object_ref(folder);
-+#else
- 	    camel_object_ref(folder);
-+#endif
- 	  }
-       }
-     else
-@@ -469,7 +492,11 @@
- 
-     if (! folder)
-       {
--	folder = mail_tool_uri_to_folder(uri, 0, NULL);
-+	folder = mail_tool_uri_to_folder(uri, 0,
-+#if EDS_CHECK_VERSION(2,91,0)
-+	      NULL,
-+#endif
-+	      NULL);
- 	if (folder)
- 	  self_cache_folder(uri, folder);
- 	else
-@@ -595,14 +622,23 @@
- 
- 	for (i = 0; i < summary->len; i++)
- 	  {
-+#if EDS_CHECK_VERSION(2,23,5)
-+	    char *uid = summary->pdata[i];
-+	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
-+#else
- 	    CamelMessageInfo *info = summary->pdata[i];
-+#endif
- 
- 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
- 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
- 	  }
- 
- 	camel_folder_free_summary(folder, summary);
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -638,7 +674,11 @@
-     if (folder)
-       {
- 	*ret = g_strdup(camel_folder_get_name(folder));
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -673,6 +713,19 @@
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(2,29,0)
-+	EShell *shell;
-+	EShellBackend *shell_backend;
-+	GtkWidget *browser;
-+
-+	shell = e_shell_get_default ();
-+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
-+
-+	browser = e_mail_browser_new (shell_backend);
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
-+	gtk_widget_show (browser);
-+#else
- 	GtkWidget *browser;
- 
- 	/* modelled after Evolution's handleuri_got_folder() */
-@@ -683,8 +736,13 @@
- 	em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
- 	em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
- 	gtk_widget_show(((EMMessageBrowser *) browser)->window);
-+#endif
- 
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -721,7 +779,11 @@
-     if (folder)
-       {
- 	status = camel_folder_set_message_flags(folder, message_uid, flags, flags);
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
- 
- 	if (! status)
- 	  g_set_error(err,
-diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
---- mail-notification-5.4/src/mn-evolution-plugin.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-10-12 16:50:15.000000000 +0400
-@@ -204,7 +204,7 @@
- }
- 
- int
--e_plugin_lib_enable (EPluginLib *ep, int enable)
-+e_plugin_lib_enable (EPlugin *ep, int enable)
- {
-   static gboolean enabled = FALSE;
-   GError *err = NULL;
---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.orig	2010-11-13 13:55:01.571934066 +0100
-+++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h	2010-11-13 13:56:07.019487418 +0100
-@@ -4,6 +4,10 @@
- #define __MN_EVOLUTION_FOLDER_TREE_SERVER_PRIVATE_H__
- 
- #include "mn-evolution-folder-tree-server.h"
-+#include <libedataserver/eds-version.h>
-+#if EDS_CHECK_VERSION(2,91,0)
-+#include <mail/e-mail-session.h>
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -23,6 +23,9 @@
- #line 41 "src/mn-evolution-folder-tree-server.gob"
- 	GtkWidget * tree;
- #line 26 "mn-evolution-folder-tree-server-private.h"
-+#if EDS_CHECK_VERSION(2,91,0)
-+       EMailSession * session;
-+#endif
- };
- 
- #ifdef __cplusplus
diff --git a/testing/mail-notification/mail-notification-5.4-gmime.patch b/testing/mail-notification/mail-notification-5.4-gmime.patch
deleted file mode 100644
index 5f516a46b..000000000
--- a/testing/mail-notification/mail-notification-5.4-gmime.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:28.000000000 +0300
-@@ -265,7 +265,7 @@
- 	    mime_message = g_mime_parser_construct_message(parser);
- 	    if (mime_message)
- 	      {
--		if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
-+		if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
- 		  {
- #if WITH_MOZILLA
- 		    type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
-diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:46:47.000000000 +0300
-@@ -167,7 +167,7 @@
- 	
-     const char *header;
- 
--    header = g_mime_message_get_header(mime_message, header_name);
-+    header = g_mime_object_get_header(mime_message, header_name);
-     if (header && mn_str_ishex(header))
-       return strtol(header, NULL, 16);
-     else
-diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c
---- mail-notification-5.4/jbsrc/jb.c	2008-05-22 19:47:04.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/jb.c	2008-12-23 14:43:09.000000000 +0300
-@@ -166,7 +166,7 @@
-   jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
--  jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
-+  jb_check_packages_for_options("GMime", "gmime", "gmime-2.6",
- 				"hotmail",
- 				"imap",
- 				"maildir",
-diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c
---- mail-notification-5.4/src/mn-message-mime.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-message-mime.c	2008-12-23 14:46:35.000000000 +0300
-@@ -33,12 +33,12 @@
-   g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
- 
-   /* SpamAssassin */
--  spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
-+  spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-   /* bogofilter */
--  spam = g_mime_message_get_header(mime_message, "X-Bogosity");
-+  spam = g_mime_object_get_header(mime_message, "X-Bogosity");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-@@ -89,7 +89,7 @@
-     {
-       const char *status;
- 
--      status = g_mime_message_get_header(mime_message, "Status");
-+      status = g_mime_object_get_header(mime_message, "Status");
-       if (status && strchr(status, 'R'))
- 	return NULL;		/* the message was read */
-       else if (status && strchr(status, 'O'))
diff --git a/testing/mail-notification/mail-notification-5.4-gtk3-support.patch b/testing/mail-notification/mail-notification-5.4-gtk3-support.patch
deleted file mode 100644
index 6a29f8622..000000000
--- a/testing/mail-notification/mail-notification-5.4-gtk3-support.patch
+++ /dev/null
@@ -1,1416 +0,0 @@
---- build/src/mn-dialog.c.orig	2011-02-02 23:08:09.816659245 +0100
-+++ build/src/mn-dialog.c	2011-02-02 23:09:16.988113774 +0100
-@@ -106,8 +106,7 @@
- #line 27 "src/mn-dialog.gob"
- 
-     gtk_container_set_border_width(GTK_CONTAINER(self), 5);
--    gtk_dialog_set_has_separator(GTK_DIALOG(self), FALSE);
--    gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(self)->vbox), 2);
-+    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(self))), 2);
-   
- #line 113 "mn-dialog.c"
-  }
---- jbsrc/jb.c.orig	2011-02-02 23:40:33.567924712 +0100
-+++ jbsrc/jb.c	2011-02-02 23:39:39.680803618 +0100
-@@ -163,7 +163,7 @@
- {
-   jb_check_glibc();
- 
--  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-+  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
-   jb_check_packages_for_options("GMime", "gmime", "gmime-2.6",
---- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:38:01.503049512 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-02 23:38:16.988222034 +0100
-@@ -358,7 +358,7 @@
- 	g_signal_connect(selfp->dialog, "response", G_CALLBACK(self_response_h), self);
-       }
- 
--    if (! GTK_WIDGET_VISIBLE(selfp->dialog))
-+    if (! gtk_widget_get_visible(selfp->dialog))
-       {
- 	GtkWindow *parent;
- 
---- build/src/mn-sound-player.c.orig	2011-02-02 23:55:02.436500397 +0100
-+++ build/src/mn-sound-player.c	2011-02-02 23:55:09.125141055 +0100
-@@ -27,7 +27,7 @@
- #include <sys/types.h>
- #include <signal.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-conf.h"
- #include "mn-locked-callback.h"
- #include "mn-util.h"
---- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:55:21.857457045 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-02 23:55:30.422996901 +0100
-@@ -25,7 +25,7 @@
- #line 39 "src/mn-file-chooser-button.gob"
- 
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- 
- #line 32 "mn-file-chooser-button.c"
---- build/src/mn-message.c.orig	2011-02-02 23:55:41.160420099 +0100
-+++ build/src/mn-message.c	2011-02-02 23:55:47.755065850 +0100
-@@ -26,7 +26,7 @@
- 
- #include <errno.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include "mn-conf.h"
- #include "mn-util.h"
---- build/src/mn-file-chooser-button.c.orig	2011-02-03 00:15:16.178407712 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-03 00:18:17.865681563 +0100
-@@ -463,6 +463,7 @@
- 
-     GDK_THREADS_ENTER();
- 
-+#if 0
-     if (results)
-       {
- 	GnomeVFSGetFileInfoResult *result = results->data;
-@@ -494,6 +495,7 @@
- 	      }
- 	  }
-       }
-+#endif
- 
-     selfp->async_handle = NULL;
-     g_object_unref(self);
---- build/src/mn-evolution-folder-tree-server.c.orig	2011-02-07 20:17:09.574274620 +0100
-+++ build/src/mn-evolution-folder-tree-server.c	2011-02-07 20:23:25.196053994 +0100
-@@ -25,6 +25,7 @@
- #line 24 "src/mn-evolution-folder-tree-server.gob"
- 
- #include <dbus/dbus.h>
-+#include <gtk/gtkx.h>
- #include <libedataserver/eds-version.h>
- #if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-@@ -71,7 +72,7 @@
- static void mn_evolution_folder_tree_server_finalize (MNEvolutionFolderTreeServer * self);
- #line 70 "mn-evolution-folder-tree-server.c"
- #line 84 "src/mn-evolution-folder-tree-server.gob"
--static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data);
-+static void mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data);
- #line 73 "mn-evolution-folder-tree-server.c"
- #line 104 "src/mn-evolution-folder-tree-server.gob"
- static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data);
-@@ -456,7 +457,7 @@
-     selfp->tree = em_folder_tree_new_with_model(model);
- #endif
- 
--    selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
-+    selfp->plug = gtk_plug_new((Window) selfp->id);
-     gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
-     gtk_widget_show_all(selfp->plug);
- 
-@@ -490,7 +491,7 @@
- 
- #line 84 "src/mn-evolution-folder-tree-server.gob"
- static void 
--mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data)
-+mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data)
- {
- #line 482 "mn-evolution-folder-tree-server.c"
- #define __GOB_FUNCTION__ "MN:Evolution:Folder:Tree:Server::plug_destroy_h"
---- src/eggtrayicon.h.orig	2011-02-07 20:25:26.352057350 +0100
-+++ src/eggtrayicon.h	2011-02-07 20:27:54.495032920 +0100
-@@ -23,10 +23,9 @@
- #ifndef __EGG_TRAY_ICON_H__
- #define __EGG_TRAY_ICON_H__
- 
--#include <gtk/gtkplug.h>
--#ifdef GDK_WINDOWING_X11
-+#include <gtk/gtk.h>
-+#include <gtk/gtkx.h>
- #include <gdk/gdkx.h>
--#endif
- 
- G_BEGIN_DECLS
- 
---- build/src/mn-mail-icon.c.orig	2011-02-07 20:24:58.971663075 +0100
-+++ build/src/mn-mail-icon.c	2011-02-07 20:30:33.714401306 +0100
-@@ -833,11 +833,13 @@
- #line 239 "src/mn-mail-icon.gob"
- 	
-     GtkWidget *widget = user_data;
-+    GtkAllocation allocation;
- 
--    gdk_window_get_origin(widget->window, x, y);
-+    gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
-+    gtk_widget_get_allocation(widget, &allocation);
- 
--    *x += widget->allocation.x;
--    *y += widget->allocation.y;
-+    *x += allocation.x;
-+    *y += allocation.y;
- 
-     if (*y > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2)
-       {
-@@ -847,7 +849,7 @@
- 	*y -= req.height;
-       }
-     else
--      *y += widget->allocation.height;
-+      *y += allocation.height;
- 
-     *push_in = TRUE;
-   }}
---- build/src/mn-mail-icon-widget.c.orig	2011-02-07 20:31:19.475816763 +0100
-+++ build/src/mn-mail-icon-widget.c	2011-02-07 21:53:48.858814715 +0100
-@@ -64,9 +64,13 @@
- #line 65 "mn-mail-icon-widget.c"
- #line 110 "src/mn-mail-icon-widget.gob"
- static void ___7_mn_mail_icon_widget_size_request (GtkWidget * widget, GtkRequisition * requisition);
-+static void
-+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint  *minimal_width, gint *natural_width);
-+static void
-+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height);
- #line 68 "mn-mail-icon-widget.c"
- #line 132 "src/mn-mail-icon-widget.gob"
--static gboolean ___8_mn_mail_icon_widget_expose_event (GtkWidget * widget, GdkEventExpose * event);
-+static gboolean ___8_mn_mail_icon_widget_draw (GtkWidget * widget, cairo_t *cr);
- #line 71 "mn-mail-icon-widget.c"
- #line 244 "src/mn-mail-icon-widget.gob"
- static GdkPixbuf * mn_mail_icon_widget_render_icon (MNMailIconWidget * self);
-@@ -187,9 +191,10 @@
- 	parent_class = g_type_class_ref (GTK_TYPE_WIDGET);
- 
- #line 110 "src/mn-mail-icon-widget.gob"
--	gtk_widget_class->size_request = ___7_mn_mail_icon_widget_size_request;
-+	gtk_widget_class->get_preferred_width = mn_mail_icon_widget_get_preferred_width;
-+	gtk_widget_class->get_preferred_height = mn_mail_icon_widget_get_preferred_height;
- #line 132 "src/mn-mail-icon-widget.gob"
--	gtk_widget_class->expose_event = ___8_mn_mail_icon_widget_expose_event;
-+	gtk_widget_class->draw = ___8_mn_mail_icon_widget_draw;
- #line 194 "mn-mail-icon-widget.c"
- 	g_object_class->dispose = ___dispose;
- 	g_object_class->finalize = ___finalize;
-@@ -234,7 +239,7 @@
-  {
- #line 93 "src/mn-mail-icon-widget.gob"
- 
--    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
-+    gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
- 
-     gtk_widget_set_name(GTK_WIDGET(self), "mn-mail-icon");
- 
-@@ -457,9 +462,28 @@
- #undef __GOB_FUNCTION__
- #undef PARENT_HANDLER
- 
-+static void
-+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint  *minimal_width, gint *natural_width)
-+{
-+    GtkRequisition requisition;
-+
-+    ___7_mn_mail_icon_widget_size_request (widget, &requisition);
-+    *minimal_width = *natural_width = requisition.width;
-+}
-+
-+static void
-+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
-+{
-+    GtkRequisition requisition;
-+
-+    ___7_mn_mail_icon_widget_size_request (widget, &requisition);
-+
-+    *minimal_height = *natural_height = requisition.height;
-+}
-+
- #line 132 "src/mn-mail-icon-widget.gob"
- static gboolean 
--___8_mn_mail_icon_widget_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-+___8_mn_mail_icon_widget_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr)
- #line 464 "mn-mail-icon-widget.c"
- #define PARENT_HANDLER(___widget,___event) \
- 	((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
-@@ -472,7 +496,7 @@
- 	
-     Self *self = SELF(widget);
- 
--    if (! GTK_WIDGET_DRAWABLE(widget) || ! selfp->stock_id)
-+    if (! gtk_widget_is_drawable(widget) || ! selfp->stock_id)
-       return FALSE;
- 
-     if (selfp->is_on)
-@@ -480,23 +504,34 @@
- 	int x;
- 	int y;
- 	GdkRectangle image_area;
-+        GtkAllocation allocation;
-+        GtkRequisition requisition;
- 
- 	/* note: widget->requisition is the pixbuf size, see size_request() */
- 
--	x = floor(widget->allocation.x + ((widget->allocation.width - widget->requisition.width) * ICON_XALIGN));
--	y = floor(widget->allocation.y + ((widget->allocation.height - widget->requisition.height) * ICON_YALIGN));
-+        gtk_widget_get_allocation(widget, &allocation);
-+        gtk_widget_get_requisition(widget, &requisition);
-+
-+	x = floor(allocation.x + ((allocation.width - requisition.width) * ICON_XALIGN));
-+	y = floor(allocation.y + ((allocation.height - requisition.height) * ICON_YALIGN));
- 
- 	image_area.x = x;
- 	image_area.y = y;
--	image_area.width = widget->requisition.width;
--	image_area.height = widget->requisition.height;
-+	image_area.width = requisition.width;
-+	image_area.height = requisition.height;
- 
-+#if 0
- 	if (gdk_rectangle_intersect(&event->area, &image_area, &image_area))
-+#endif
- 	  {
- 	    GdkPixbuf *pixbuf;
- 
- 	    pixbuf = self_render_icon(self);
-+            gdk_cairo_set_source_pixbuf(cr, pixbuf, image_area.x, image_area.y);
-+            cairo_move_to(cr, image_area.x - x, image_area.y - y);
-+            cairo_paint(cr);
- 
-+#if 0
- 	    gdk_draw_pixbuf(widget->window,
- 			    NULL,
- 			    pixbuf,
-@@ -509,6 +544,7 @@
- 			    GDK_RGB_DITHER_NORMAL,
- 			    0,
- 			    0);
-+#endif
- 
- 	    g_object_unref(pixbuf);
- 	  }
-@@ -523,13 +559,16 @@
- 	int box_y;
- 	int box_width;
- 	int box_height;
-+        GtkAllocation allocation;
-+
-+        gtk_widget_get_allocation(widget, &allocation);
- 
- 	if (! selfp->count_layout)
- 	  {
- 	    const char *size;
- 	    char *markup;
- 
--	    if (widget->allocation.height < 32)
-+	    if (allocation.height < 32)
- 	      size = "small";
- 	    else
- 	      size = "medium";
-@@ -546,17 +585,16 @@
- 	box_width = count_rect.width + COUNT_BOX_XPAD * 2;
- 	box_height = count_rect.height + COUNT_BOX_YPAD * 2;
- 
--	box_x = widget->allocation.x + widget->allocation.width - box_width - COUNT_BOX_XMARGIN;
--	box_y = widget->allocation.y + widget->allocation.height - box_height - COUNT_BOX_YMARGIN;
-+	box_x = allocation.x + allocation.width - box_width - COUNT_BOX_XMARGIN;
-+	box_y = allocation.y + allocation.height - box_height - COUNT_BOX_YMARGIN;
- 
- 	count_x = box_x - count_rect.x + COUNT_BOX_XPAD;
- 	count_y = box_y - count_rect.y + COUNT_BOX_YPAD;
- 
--	gtk_paint_box(widget->style,
--		      widget->window,
--		      GTK_WIDGET_STATE(widget),
-+	gtk_paint_box(gtk_widget_get_style(widget),
-+		      cr,
-+		      gtk_widget_get_state_flags(widget),
- 		      GTK_SHADOW_OUT,
--		      &event->area,
- 		      widget,
- 		      NULL,
- 		      box_x,
-@@ -564,11 +602,10 @@
- 		      box_width,
- 		      box_height);
- 
--	gtk_paint_layout(widget->style,
--			 widget->window,
--			 GTK_WIDGET_STATE(widget),
-+	gtk_paint_layout(gtk_widget_get_style(widget),
-+			 cr,
-+			 gtk_widget_get_state_flags(widget),
- 			 FALSE,
--			 &event->area,
- 			 widget,
- 			 NULL,
- 			 count_x,
---- build/src/mn-mailbox-properties-dialog.c.orig	2011-02-07 21:57:31.257251776 +0100
-+++ build/src/mn-mailbox-properties-dialog.c	2011-02-07 21:56:56.989854854 +0100
-@@ -456,7 +456,7 @@
-     MNMailboxProperties *properties;
- 
-     mn_container_create_interface(GTK_CONTAINER(self),
--				  PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.glade",
-+				  PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.ui",
- 				  "notebook",
- 				  "mn_mailbox_properties_dialog_",
- 				  "notebook", &self->notebook,
-@@ -1290,7 +1290,7 @@
- {
- #line 686 "src/mn-mailbox-properties-dialog.gob"
- 	
--    if (GTK_WIDGET_IS_SENSITIVE(GTK_WINDOW(self)->default_widget))
-+    if (gtk_widget_is_sensitive(gtk_window_get_default_widget(GTK_WINDOW(self))))
-       gtk_window_activate_default(GTK_WINDOW(self));
-     else
-       {
-@@ -1313,9 +1313,9 @@
- 	    if (elem->data == entry)
- 	      break;
- 
--	    if (GTK_WIDGET_MAPPED(elem->data)
--		&& GTK_WIDGET_VISIBLE(elem->data)
--		&& GTK_WIDGET_SENSITIVE(elem->data))
-+	    if (gtk_widget_get_mapped(elem->data)
-+		&& gtk_widget_get_visible(elem->data)
-+		&& gtk_widget_get_sensitive(elem->data))
- 	      next = elem->data;
- 	  }
- 	while (! next);
---- build/src/mn-mailbox-view.c.orig	2011-02-07 22:18:49.962462920 +0100
-+++ build/src/mn-mailbox-view.c	2011-02-07 23:01:39.990363248 +0100
-@@ -412,23 +412,23 @@
-     binding_set = gtk_binding_set_by_class(class);
- 
-     /* Delete removes a row */
--    gtk_binding_entry_add_signal(binding_set, GDK_Delete, 0, "activate-remove", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_KP_Delete, 0, "activate-remove", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, 0, "activate-remove", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Delete, 0, "activate-remove", 0);
- 
-     /* HIG 2.0 cut/copy/paste shortcuts */
--    gtk_binding_entry_add_signal(binding_set, GDK_x, GDK_CONTROL_MASK, "activate-cut", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_c, GDK_CONTROL_MASK, "activate-copy", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK, "activate-paste", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_x, GDK_CONTROL_MASK, "activate-cut", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_c, GDK_CONTROL_MASK, "activate-copy", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_v, GDK_CONTROL_MASK, "activate-paste", 0);
- 
-     /* cut/copy/paste shortcuts taken from gtkentry.c */
--    gtk_binding_entry_add_signal(binding_set, GDK_Delete, GDK_SHIFT_MASK, "activate-cut", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_CONTROL_MASK, "activate-copy", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_SHIFT_MASK, "activate-paste", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK, "activate-cut", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK, "activate-copy", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK, "activate-paste", 0);
- 
-     /* HIG 2.0 properties */
--    gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_MOD1_MASK, "activate-properties", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Return, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-   
- #line 434 "mn-mailbox-view.c"
-  }
-@@ -934,14 +934,13 @@
- #line 183 "src/mn-mailbox-view.gob"
- 	
-     GtkSelectionData *data;
--
-     data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_MAILBOXES].atom);
-     if (data)
-       {
- 	GSList *configurations;
- 	GSList *l;
- 
--	memcpy(&configurations, data->data, data->length);
-+	memcpy(&configurations, gtk_selection_data_get_data(data), gtk_selection_data_get_length(data));
- 
- 	MN_LIST_FOREACH(l, configurations)
- 	  {
-@@ -962,14 +961,14 @@
-     data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_GNOME_COPIED_FILES].atom);
-     if (data)
-       {
--	if (data->format == 8 && data->length > 0)
-+	if (gtk_selection_data_get_format(data) == 8 && gtk_selection_data_get_length(data) > 0)
- 	  {
- 	    char *gnome_copied_files;
- 	    gboolean status;
- 	    MNGnomeCopiedFilesType type;
- 	    GSList *uri_list;
- 
--	    gnome_copied_files = g_strndup(data->data, data->length);
-+	    gnome_copied_files = g_strndup(gtk_selection_data_get_data(data), gtk_selection_data_get_length(data));
- 	    status = mn_parse_gnome_copied_files(gnome_copied_files, &type, &uri_list);
- 	    g_free(gnome_copied_files);
- 
---- build/src/mn-shell.c.orig	2011-02-07 23:02:17.852293679 +0100
-+++ build/src/mn-shell.c	2011-02-07 23:04:39.223548403 +0100
-@@ -158,7 +158,7 @@
- static void mn_shell_icon_activate_about_h (MNMailIcon * icon, gpointer user_data);
- #line 160 "mn-shell.c"
- #line 499 "src/mn-shell.gob"
--static void mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data);
-+static void mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data);
- #line 163 "mn-shell.c"
- #line 508 "src/mn-shell.gob"
- static void mn_shell_update_sensitivity (MNShell * self);
-@@ -1006,7 +1006,7 @@
- 
- #line 499 "src/mn-shell.gob"
- static void 
--mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data)
-+mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data)
- {
- #line 1004 "mn-shell.c"
- #define __GOB_FUNCTION__ "MN:Shell::icon_destroy_h"
---- build/src/mn-text-table.c.orig	2011-02-07 23:05:08.799927792 +0100
-+++ build/src/mn-text-table.c	2011-02-07 23:18:06.480056895 +0100
-@@ -69,9 +69,11 @@
- #line 70 "mn-text-table.c"
- #line 104 "src/mn-text-table.gob"
- static void ___4_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition);
-+static void mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width);
-+static void mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height);
- #line 73 "mn-text-table.c"
- #line 115 "src/mn-text-table.gob"
--static gboolean ___5_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event);
-+static gboolean ___5_mn_text_table_draw (GtkWidget * widget, cairo_t *cr);
- #line 76 "mn-text-table.c"
- #line 165 "src/mn-text-table.gob"
- static void mn_text_table_set_dirty (MNTextTable * self);
-@@ -188,9 +190,10 @@
- 	parent_class = g_type_class_ref (GTK_TYPE_WIDGET);
- 
- #line 104 "src/mn-text-table.gob"
--	gtk_widget_class->size_request = ___4_mn_text_table_size_request;
-+        gtk_widget_class->get_preferred_width = mn_text_table_get_preferred_width;
-+        gtk_widget_class->get_preferred_height = mn_text_table_get_preferred_height;
- #line 115 "src/mn-text-table.gob"
--	gtk_widget_class->expose_event = ___5_mn_text_table_expose_event;
-+	gtk_widget_class->draw = ___5_mn_text_table_draw;
- #line 257 "src/mn-text-table.gob"
- 	c->clear = ___real_mn_text_table_clear;
- #line 197 "mn-text-table.c"
-@@ -216,7 +219,7 @@
-  {
- #line 80 "src/mn-text-table.gob"
- 
--    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
-+    gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
- 
-     g_object_connect(self,
- 		     "swapped-signal::style-set", self_context_changed, self,
-@@ -290,9 +293,29 @@
- #undef __GOB_FUNCTION__
- #undef PARENT_HANDLER
- 
-+static void
-+mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width)
-+{
-+    GtkRequisition requisition;
-+
-+    ___4_mn_text_table_size_request (widget, &requisition);
-+
-+    *minimal_width = *natural_width = requisition.width;
-+}
-+
-+static void
-+mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height)
-+{
-+    GtkRequisition requisition;
-+
-+    ___4_mn_text_table_size_request (widget, &requisition);
-+
-+    *minimal_height = *natural_height = requisition.height;
-+}
-+
- #line 115 "src/mn-text-table.gob"
- static gboolean 
--___5_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-+___5_mn_text_table_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr)
- #line 297 "mn-text-table.c"
- #define PARENT_HANDLER(___widget,___event) \
- 	((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
-@@ -304,10 +327,14 @@
- #line 117 "src/mn-text-table.gob"
- 	
-     Self *self = SELF(widget);
-+    GtkAllocation allocation;
-     int i;
--    int y = widget->allocation.y;
-+    int y;
-+
-+    gtk_widget_get_allocation(widget, &allocation);
-+    y = 0;
- 
--    if (! GTK_WIDGET_DRAWABLE(widget))
-+    if (! gtk_widget_is_drawable(widget))
-       return FALSE;
- 
-     self_relayout(self);
-@@ -316,7 +343,7 @@
-       {
- 	Row *row = g_ptr_array_index(selfp->rows, i);
- 	int j;
--	int x = widget->allocation.x;
-+	int x = 0;
- 	int column = 0;
- 
- 	MN_ARRAY_FOREACH(j, row->cells)
-@@ -324,11 +351,10 @@
- 	    MNTextTableCell *cell = g_ptr_array_index(row->cells, j);
- 
- 	    if (cell->layout)
--	      gtk_paint_layout(widget->style,
--			       widget->window,
--			       GTK_WIDGET_STATE(widget),
-+	      gtk_paint_layout(gtk_widget_get_style(widget),
-+			       cr,
-+			       gtk_widget_get_state_flags(widget),
- 			       FALSE,
--			       &event->area,
- 			       widget,
- 			       NULL,
- 			       x,
---- build/src/mn-tooltips.c.orig	2011-02-07 23:19:05.903761972 +0100
-+++ build/src/mn-tooltips.c	2011-02-07 23:41:19.368621912 +0100
-@@ -104,7 +104,7 @@
- static void mn_tooltips_set_tip_widget_real (MNTooltips * self, GtkWidget * widget, GtkWidget * tip_widget, int border_width);
- #line 106 "mn-tooltips.c"
- #line 287 "src/mn-tooltips.gob"
--static gboolean mn_tooltips_paint_window (MNTooltips * self);
-+static gboolean mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr);
- #line 109 "mn-tooltips.c"
- #line 308 "src/mn-tooltips.gob"
- static void mn_tooltips_draw_tips (MNTooltips * self);
-@@ -422,7 +422,13 @@
- 	
-     if (! selfp->window)
-       {
-+	GtkStyleContext *ctx;
-+
- 	selfp->window = gtk_window_new(GTK_WINDOW_POPUP);
-+
-+	ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window));
-+	gtk_style_context_add_class(ctx, "tooltip");
-+
- 	self_update_screen(self, TRUE);
- 	gtk_widget_set_app_paintable(selfp->window, TRUE);
- 	gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE);
-@@ -430,7 +430,7 @@
- 	gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width);
- 
- 	g_signal_connect_swapped(selfp->window,
--				 "expose-event",
-+				 "draw",
- 				 G_CALLBACK(self_paint_window),
- 				 self);
- 
-@@ -490,7 +490,7 @@
- 
-     if (selfp->active_data
- 	&& selfp->active_data->widget == widget
--	&& GTK_WIDGET_DRAWABLE(selfp->active_data->widget))
-+	&& gtk_widget_is_drawable(selfp->active_data->widget))
-       {
- 	if (data->tip_widget)
- 	  g_object_unref(data->tip_widget);
-@@ -594,7 +594,7 @@
- 
- #line 287 "src/mn-tooltips.gob"
- static gboolean 
--mn_tooltips_paint_window (MNTooltips * self)
-+mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr)
- {
- #line 600 "mn-tooltips.c"
- #define __GOB_FUNCTION__ "MN:Tooltips::paint_window"
-@@ -608,18 +608,13 @@
- 	
-     GtkRequisition req;
- 
--    gtk_widget_size_request(selfp->window, &req);
--    gtk_paint_flat_box(selfp->window->style,
--		       selfp->window->window,
--		       GTK_STATE_NORMAL,
--		       GTK_SHADOW_OUT,
--		       NULL,
--		       selfp->window,
--		       "tooltip",
--		       0,
--		       0,
--		       req.width,
--		       req.height);
-+    gtk_widget_size_request(GTK_WIDGET(selfp->window), &req);
-+    gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)),
-+                                                       cr,
-+                                                       0,
-+                                                       0,
-+                                                       req.width,
-+                                                       req.height);
- 
-     return FALSE;
-   }}
-@@ -651,10 +650,11 @@
-     gint monitor_num, px, py;
-     GdkRectangle monitor;
-     int screen_width;
-+    GtkAllocation allocation;
- 
-     if (! selfp->window)
-       self_force_window(self);
--    else if (GTK_WIDGET_VISIBLE(selfp->window))
-+    else if (gtk_widget_get_visible(selfp->window))
-       g_get_current_time(&selfp->last_popdown);
- 
-     gtk_widget_ensure_style(selfp->window);
-@@ -670,7 +670,7 @@
- 
-     data = selfp->active_data;
- 
--    child = GTK_BIN(selfp->window)->child;
-+    child = gtk_bin_get_child(GTK_BIN(selfp->window));
-     if (child)
-       gtk_container_remove(GTK_CONTAINER(selfp->window), child);
- 
-@@ -684,14 +684,16 @@
-     w = requisition.width;
-     h = requisition.height;
- 
--    gdk_window_get_origin(widget->window, &x, &y);
--    if (GTK_WIDGET_NO_WINDOW(widget))
-+    gtk_widget_get_allocation(selfp->window, &allocation);
-+
-+    gdk_window_get_origin(gtk_widget_get_window(widget), &x, &y);
-+    if (! gtk_widget_get_has_window(widget))
-       {
--	x += widget->allocation.x;
--	y += widget->allocation.y;
-+	x += allocation.x;
-+	y += allocation.y;
-       }
- 
--    x += widget->allocation.width / 2;
-+    x += allocation.width / 2;
- 
-     if (! keyboard_mode)
-       gdk_window_get_pointer(gdk_screen_get_root_window(screen), &x, NULL, NULL);
-@@ -712,11 +714,11 @@
-     else if (x < monitor.x)
-       x = monitor.x;
- 
--    if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height
-+    if ((y + h + allocation.height + 4) > monitor.y + monitor.height
- 	&& (y - 4) > monitor.y)
-       y = y - h - 4;
-     else
--      y = y + widget->allocation.height + 4;
-+      y = y + allocation.height + 4;
- 
-     /*
-      * The following block is not part of GTK+ and has been added to
-@@ -760,7 +762,7 @@
- 	
-     Self *self = SELF(data);
- 
--    if (selfp->active_data && GTK_WIDGET_DRAWABLE(selfp->active_data->widget))
-+    if (selfp->active_data && gtk_widget_is_drawable(selfp->active_data->widget))
-       self_draw_tips(self);
- 
-     selfp->timeout_id = 0;
-@@ -785,7 +787,7 @@
- 	
-     if (selfp->window)
-       {
--	if (GTK_WIDGET_VISIBLE(selfp->window))
-+	if (gtk_widget_get_visible(selfp->window))
- 	  g_get_current_time(&selfp->last_popdown);
- 	gtk_widget_hide(selfp->window);
-       }
-@@ -802,7 +804,7 @@
- 	{
- 	  TooltipsData *data = l->data;
- 
--	  if (data->widget == widget && GTK_WIDGET_DRAWABLE(widget))
-+	  if (data->widget == widget && gtk_widget_is_drawable(widget))
- 	    {
- 	      selfp->active_data = data;
- 	      break;
-@@ -937,7 +939,7 @@
- 
-     if (GTK_IS_WINDOW(toplevel))
-       {
--	GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget;
-+	GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel));
- 
- 	g_object_set_data(G_OBJECT(toplevel), TOOLTIPS_KEYBOARD_MODE, GINT_TO_POINTER(TRUE));
- 
-@@ -966,7 +968,7 @@
- 
-     if (GTK_IS_WINDOW(toplevel))
-       {
--	GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget;
-+	GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel));
- 
- 	if (focus)
- 	  self_hide_tip(focus);
-@@ -1057,24 +1059,24 @@
- 	    break;
- 
- 	  case GDK_ENTER_NOTIFY:
--	    if (! (GTK_IS_MENU_ITEM(widget) && GTK_MENU_ITEM(widget)->submenu))
-+	    if (! (GTK_IS_MENU_ITEM(widget) && gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget))))
- 	      self_start_delay(self, widget);
- 	    break;
- 
- 	  case GDK_LEAVE_NOTIFY:
- 	    self_set_active_widget(self, NULL);
--	    selfp->use_sticky_delay = selfp->window && GTK_WIDGET_VISIBLE(selfp->window);
-+	    selfp->use_sticky_delay = selfp->window && gtk_widget_get_visible(selfp->window);
- 	    break;
- 
- 	  case GDK_MOTION_NOTIFY:
- 	    /* Handle menu items specially ... pend popup for each motion
- 	     * on other widgets, we ignore motion.
- 	     */
--	    if (GTK_IS_MENU_ITEM(widget) && ! GTK_MENU_ITEM(widget)->submenu)
-+	    if (GTK_IS_MENU_ITEM(widget) && ! gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)))
- 	      {
- 		/* Completely evil hack to make sure we get the LEAVE_NOTIFY
- 		 */
--		GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING);
-+		//GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING);
- 		self_set_active_widget(self, NULL);
- 		self_start_delay(self, widget);
- 		break;
---- src/nautilus-cell-renderer-pixbuf-emblem.c.orig	2011-02-08 00:16:43.847831409 +0100
-+++ src/nautilus-cell-renderer-pixbuf-emblem.c	2011-02-08 00:32:59.128682767 +0100
-@@ -39,17 +39,16 @@
-                                                           GtkWidget             *widget);
- static void nautilus_cell_renderer_pixbuf_emblem_get_size   (GtkCellRenderer            *cell,
-                                                  GtkWidget                  *widget,
--                                                 GdkRectangle               *rectangle,
-+                                                 const GdkRectangle               *rectangle,
-                                                  gint                       *x_offset,
-                                                  gint                       *y_offset,
-                                                  gint                       *width,
-                                                  gint                       *height);
- static void     nautilus_cell_renderer_pixbuf_emblem_render     (GtkCellRenderer            *cell,
--                                                          GdkWindow                  *window,
-+                                                          cairo_t                    *cr,
-                                                           GtkWidget                  *widget,
--                                                          GdkRectangle               *background_area,
--                                                          GdkRectangle               *cell_area,
--                                                          GdkRectangle               *expose_area,
-+                                                          const GdkRectangle               *background_area,
-+                                                          const GdkRectangle               *cell_area,
-                                                           GtkCellRendererState                       flags);
- 
- enum {
-@@ -356,7 +355,7 @@
- static void
- nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell,
- 				   GtkWidget       *widget,
--				   GdkRectangle    *cell_area,
-+				   const GdkRectangle    *cell_area,
- 				   gint            *x_offset,
- 				   gint            *y_offset,
- 				   gint            *width,
-@@ -368,6 +367,10 @@
- 	gint pixbuf_height = 0;
- 	gint calc_width;
- 	gint calc_height;
-+	int xpad;
-+	int ypad;
-+	gfloat xalign;
-+	gfloat yalign;
- 
- 	if (!cellpixbuf->pixbuf && cellinfo->stock_id)
- 		nautilus_cell_renderer_pixbuf_emblem_create_stock_pixbuf (cellpixbuf, widget);
-@@ -385,8 +388,11 @@
- 		pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed));
- 	}
- 
--	calc_width  = (gint) cell->xpad * 2 + pixbuf_width;
--	calc_height = (gint) cell->ypad * 2 + pixbuf_height;
-+	gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-+	gtk_cell_renderer_get_alignment(cell, &xalign, &yalign);
-+
-+	calc_width  = (gint) xpad * 2 + pixbuf_width;
-+	calc_height = (gint) ypad * 2 + pixbuf_height;
- 
- 	if (x_offset) *x_offset = 0;
- 	if (y_offset) *y_offset = 0;
-@@ -394,14 +400,14 @@
- 	if (cell_area && pixbuf_width > 0 && pixbuf_height > 0) {
- 		if (x_offset) {
- 			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
--				1.0 - cell->xalign : cell->xalign) *
--				(cell_area->width - calc_width - 2 * cell->xpad));
--			*x_offset = MAX (*x_offset, 0) + cell->xpad;
-+				1.0 - xalign : xalign) *
-+				(cell_area->width - calc_width - 2 * xpad));
-+			*x_offset = MAX (*x_offset, 0) + xpad;
- 		}
- 		if (y_offset) {
--			*y_offset = (cell->yalign *
--				(cell_area->height - calc_height - 2 * cell->ypad));
--			*y_offset = MAX (*y_offset, 0) + cell->ypad;
-+			*y_offset = (yalign *
-+				(cell_area->height - calc_height - 2 * ypad));
-+			*y_offset = MAX (*y_offset, 0) + ypad;
- 		}
- 	}
- 
-@@ -414,11 +420,10 @@
- 
- static void
- nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer      *cell,
--                                 GdkWindow            *window,
-+                                 cairo_t              *cr,
-                                  GtkWidget            *widget,
--                                 GdkRectangle         *background_area,
--                                 GdkRectangle         *cell_area,
--                                 GdkRectangle         *expose_area,
-+                                 const GdkRectangle   *background_area,
-+                                 const GdkRectangle   *cell_area,
-                                  GtkCellRendererState  flags)
- 
- {
-@@ -429,13 +434,19 @@
- 	GdkRectangle pix_emblem_rect;
- 	GdkRectangle draw_rect;
- 	gboolean stock_pixbuf = FALSE;
-+	gboolean is_expander = FALSE;
-+	gboolean is_expanded = FALSE;
-+	int xpad;
-+	int ypad;
-+
-+	g_object_get(cell, "is-expander", &is_expander, "is-expanded", &is_expanded, NULL);
- 
- 	pixbuf = cellpixbuf->pixbuf;
--	if (cell->is_expander) {
--		if (cell->is_expanded &&
-+	if (is_expander) {
-+		if (is_expanded &&
- 		    cellpixbuf->pixbuf_expander_open != NULL) {
- 			pixbuf = cellpixbuf->pixbuf_expander_open;
--		} else if (!cell->is_expanded &&
-+		} else if (!is_expanded &&
- 			   cellpixbuf->pixbuf_expander_closed != NULL) {
- 			pixbuf = cellpixbuf->pixbuf_expander_closed;
- 		}
-@@ -456,15 +467,20 @@
- 	if (stock_pixbuf)
- 		pixbuf = cellpixbuf->pixbuf;
- 
-+	gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-+
- 	pix_rect.x += cell_area->x;
- 	pix_rect.y += cell_area->y;
--	pix_rect.width  -= cell->xpad * 2;
--	pix_rect.height -= cell->ypad * 2;
-+	pix_rect.width  -= xpad * 2;
-+	pix_rect.height -= ypad * 2;
- 
-+	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) {
-+#if 0
- 	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) &&
- 	    gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) {
-+
- 		gdk_draw_pixbuf (window,
--			widget->style->black_gc,
-+			gtk_widget_get_style(widget)->black_gc,
- 			pixbuf,
- 			/* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
- 			draw_rect.x - pix_rect.x,
-@@ -475,6 +491,11 @@
- 			draw_rect.height,
- 			GDK_RGB_DITHER_NORMAL,
- 			0, 0);
-+#endif
-+
-+		cairo_move_to (cr, draw_rect.x - pix_rect.x, draw_rect.y - pix_rect.y);
-+		gdk_cairo_set_source_pixbuf (cr, pixbuf, draw_rect.x, draw_rect.y);
-+		cairo_paint (cr);
- 	}
- 
- 	if (cellpixbuf->pixbuf_emblem) {
-@@ -482,8 +503,11 @@
- 		pix_emblem_rect.height = gdk_pixbuf_get_height (cellpixbuf->pixbuf_emblem);
- 		pix_emblem_rect.x = pix_rect.x;
- 		pix_emblem_rect.y = pix_rect.y + pix_rect.height - pix_emblem_rect.height;
-+		if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect)) {
-+#if 0
- 		if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect) &&
- 		    gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) {
-+
- 			gdk_draw_pixbuf (window,
- 				widget->style->black_gc,
- 				cellpixbuf->pixbuf_emblem,
-@@ -496,6 +520,11 @@
- 				draw_rect.height,
- 				GDK_RGB_DITHER_NORMAL,
- 				0, 0);
-+#endif
-+
-+			cairo_move_to (cr, draw_rect.x - pix_emblem_rect.x, draw_rect.y - pix_emblem_rect.y);
-+			gdk_cairo_set_source_pixbuf (cr, cellpixbuf->pixbuf_emblem, draw_rect.x, draw_rect.y);
-+			cairo_paint (cr);
- 		}
- 	}
- }
---- src/nautilus-cell-renderer-pixbuf-emblem.h.orig	2011-02-07 22:18:12.336471764 +0100
-+++ src/nautilus-cell-renderer-pixbuf-emblem.h	2011-02-08 00:20:30.461758697 +0100
-@@ -25,18 +25,18 @@
- #ifndef NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
- 
--#include <gtk/gtkcellrenderer.h>
-+#include <gtk/gtk.h>
- 
- #define NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM \
- 	(nautilus_cell_renderer_pixbuf_emblem_get_type ())
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
--	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem))
-+	(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem))
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
--	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass))
-+	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass))
- #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
--	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
- #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
--	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-+	(G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
- 
- typedef struct _NautilusCellRendererPixbufEmblem NautilusCellRendererPixbufEmblem;
- typedef struct _NautilusCellRendererPixbufEmblemClass NautilusCellRendererPixbufEmblemClass;
---- build/src/mn-authenticated-mailbox.c.orig	2011-02-08 00:34:16.332610802 +0100
-+++ build/src/mn-authenticated-mailbox.c	2011-02-08 00:36:23.706936717 +0100
-@@ -25,7 +25,7 @@
- #line 29 "src/mn-authenticated-mailbox.gob"
- 
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-mailbox-private.h"
- #include "mn-shell.h"
- #include "mn-util.h"
-@@ -859,6 +859,7 @@
- 
-     /* keep the title in sync with gnome-authentication-manager */
- 
-+#if 0
-     /* translators: header capitalization */
-     selfp->auth_dialog = gnome_password_dialog_new(_("Authentication Required"),
- 						   message,
-@@ -891,6 +892,9 @@
-     gtk_widget_destroy(selfp->auth_dialog);
- 
-     return ok;
-+#else
-+    return FALSE;
-+#endif
-   }}
- #line 896 "mn-authenticated-mailbox.c"
- #undef __GOB_FUNCTION__
---- build/src/mn-about-dialog.c.orig	2011-02-08 22:20:54.469841262 +0100
-+++ build/src/mn-about-dialog.c	2011-02-08 22:21:13.309839037 +0100
-@@ -111,9 +111,11 @@
-  {
- #line 32 "src/mn-about-dialog.gob"
- 
-+#if 0
-     gtk_about_dialog_set_email_hook(self_activate_link_cb, "mailto:", NULL);
-     gtk_about_dialog_set_url_hook(self_activate_link_cb, NULL, NULL);
--  
-+#endif
-+
- #line 118 "mn-about-dialog.c"
-  }
- }
---- build/src/mn-autodetect-mailbox-properties.c.orig	2011-02-08 22:21:58.639427345 +0100
-+++ build/src/mn-autodetect-mailbox-properties.c	2011-02-08 22:22:43.564035901 +0100
-@@ -355,10 +355,9 @@
- 
-     toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button));
-     /* translators: header capitalization */
--    selfp->chooser = gtk_file_chooser_dialog_new_with_backend(_("Select a File or Folder"),
-+    selfp->chooser = gtk_file_chooser_dialog_new(_("Select a File or Folder"),
- 							      GTK_WINDOW(toplevel),
- 							      GTK_FILE_CHOOSER_ACTION_OPEN,
--							      "gnome-vfs",
- 							      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- 							      GTK_STOCK_OPEN, 1,
- 							      NULL);
---- build/src/mn-pi-mailbox-properties.c.orig	2011-02-08 22:30:08.051375715 +0100
-+++ build/src/mn-pi-mailbox-properties.c	2011-02-08 22:30:21.398665261 +0100
-@@ -415,7 +415,7 @@
-     int i;
- 
-     for (i = 0; i < MN_PI_MAILBOX_N_CONNECTION_TYPES; i++)
--      gtk_widget_set_sensitive(self->port_spin[i], GTK_WIDGET_SENSITIVE(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i])));
-+      gtk_widget_set_sensitive(self->port_spin[i], gtk_widget_get_sensitive(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i])));
- 
-     g_object_notify(G_OBJECT(self), "complete");
-   }}
---- src/eggtrayicon.c.orig	2011-02-07 23:42:30.405791829 +0100
-+++ src/eggtrayicon.c	2011-02-08 23:06:16.092968325 +0100
-@@ -25,7 +25,7 @@
- 
- #include "eggtrayicon.h"
- 
--#include <gdkconfig.h>
-+#include <gdk/gdk.h>
- #if defined (GDK_WINDOWING_X11)
- #include <gdk/gdkx.h>
- #include <X11/Xatom.h>
-@@ -258,7 +258,7 @@
-     {
-       GdkWindow *gdkwin;
- 
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-+      gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (widget),
-                                               icon->manager_window);
- 
-       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-@@ -290,7 +290,7 @@
-   ev.window = window;
-   ev.message_type = icon->system_tray_opcode_atom;
-   ev.format = 32;
--  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-+  ev.data.l[0] = gdk_x11_get_server_time (gtk_widget_get_window(GTK_WIDGET (icon)));
-   ev.data.l[1] = message;
-   ev.data.l[2] = data1;
-   ev.data.l[3] = data2;
-@@ -342,12 +342,12 @@
-     {
-       GdkWindow *gdkwin;
- 
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+      gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					      icon->manager_window);
- 
-       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
- 
--      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-+      if (dock_if_realized && gtk_widget_get_realized (GTK_WIDGET(icon)))
- 	egg_tray_icon_send_dock_request (icon);
- 
-       egg_tray_icon_get_orientation_property (icon);
-@@ -355,10 +355,16 @@
- }
- 
- static gboolean
--transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-+transparent_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data)
- {
--  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-+#if 0
-+  gdk_window_clear_area (gtk_widget_get_window(widget), event->area.x, event->area.y,
- 			 event->area.width, event->area.height);
-+#endif
-+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-+  //gdk_cairo_region (cr, event->region);
-+  cairo_fill (cr);
-+
-   return FALSE;
- }
- 
-@@ -366,20 +372,20 @@
- make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
- 			gpointer user_data)
- {
--  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+  //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE);
- }
- 
- static void
- make_transparent (GtkWidget *widget, gpointer user_data)
- {
--  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+  if (! gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget))
-     return;
- 
-   gtk_widget_set_app_paintable (widget, TRUE);
-   gtk_widget_set_double_buffered (widget, FALSE);
--  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
--  g_signal_connect (widget, "expose_event",
--		    G_CALLBACK (transparent_expose_event), NULL);
-+  //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE);
-+  g_signal_connect (widget, "draw",
-+		    G_CALLBACK (transparent_draw), NULL);
-   g_signal_connect_after (widget, "style_set",
- 			  G_CALLBACK (make_transparent_again), NULL);
- }
-@@ -391,7 +397,7 @@
- 
-   g_return_if_fail (icon->manager_window != None);
- 
--  gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+  gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					  icon->manager_window);
- 
-   gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
---- build/src/mn-properties-dialog.c.orig	2011-02-08 23:37:12.605200174 +0100
-+++ build/src/mn-properties-dialog.c	2011-02-08 23:37:18.601881191 +0100
-@@ -183,7 +183,7 @@
-     GtkTreeSelection *selection;
- 
-     mn_container_create_interface(GTK_CONTAINER(self),
--				  PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.glade",
-+				  PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.ui",
- 				  "main_vbox",
- 				  "mn_properties_dialog_",
- 				  "notebook", &selfp->notebook,
---- src/mn-util.c.orig	2011-02-08 00:01:25.167207512 +0100
-+++ src/mn-util.c	2011-02-09 00:01:35.718285446 +0100
-@@ -26,8 +26,7 @@
- #include <gmodule.h>
- #include <glib/gi18n.h>
- #include <gobject/gvaluecollector.h>
--#include <gnome.h>
--#include <glade/glade.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- #include "mn-mailboxes.h"
- #include "mn-shell.h"
-@@ -303,49 +302,55 @@
-   return pixbuf;
- }
- 
--static GladeXML *
-+static GtkBuilder *
- mn_glade_xml_new (const char *filename, const char *root, const char *domain)
- {
--  GladeXML *xml;
-+  GtkBuilder *builder;
-+  GError *err = NULL;
- 
-   g_return_val_if_fail(filename != NULL, NULL);
- 
--  xml = glade_xml_new(filename, root, domain);
--  if (! xml)
--    mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\".", filename);
-+  builder = gtk_builder_new();
-+  gtk_builder_set_translation_domain(builder, domain);
-+  if (! gtk_builder_add_from_file(builder, filename, &err)) {
-+    mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\": %s.", filename, err->message);
-+    g_error_free(err);
-+    g_object_unref(builder);
-+    return NULL;
-+  }
- 
--  return xml;
-+  return builder;
- }
- 
- static GtkWidget *
--mn_glade_xml_get_widget (GladeXML *xml, const char *widget_name)
-+mn_glade_xml_get_widget (GtkBuilder *builder, const char *widget_name)
- {
-   GtkWidget *widget;
- 
--  g_return_val_if_fail(GLADE_IS_XML(xml), NULL);
-+  g_return_val_if_fail(GTK_IS_BUILDER(builder), NULL);
-   g_return_val_if_fail(widget_name != NULL, NULL);
- 
--  widget = glade_xml_get_widget(xml, widget_name);
-+  widget = GTK_WIDGET(gtk_builder_get_object(builder, widget_name));
-   if (! widget)
--    mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface \"%s\".", widget_name, xml->filename);
-+    mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface.", widget_name);
- 
-   return widget;
- }
- 
- static void
--create_interface_connect_cb (const char *handler_name,
-+create_interface_connect_cb (GtkBuilder *builder,
- 			     GObject *object,
- 			     const char *signal_name,
--			     const char *signal_data,
-+			     const char *handler_name,
- 			     GObject *connect_object,
--			     gboolean after,
-+                             GConnectFlags flags,
- 			     gpointer user_data)
- {
-   static GModule *module = NULL;
-   ContainerCreateInterfaceConnectInfo *info = user_data;
-   char *cb_name;
-   GCallback cb;
--  GConnectFlags flags;
-+  GConnectFlags cflags;
- 
-   if (! module)
-     {
-@@ -359,11 +364,9 @@
-     mn_show_fatal_error_dialog(NULL, "Signal handler \"%s\" not found.", cb_name);
-   g_free(cb_name);
- 
--  flags = G_CONNECT_SWAPPED;
--  if (after)
--    flags |= G_CONNECT_AFTER;
-+  cflags = G_CONNECT_SWAPPED;
- 
--  g_signal_connect_data(object, signal_name, cb, info->container, NULL, flags);
-+  g_signal_connect_data(object, signal_name, cb, info->container, NULL, cflags);
- }
- 
- void
-@@ -373,7 +376,7 @@
- 			       const char *callback_prefix,
- 			       ...)
- {
--  GladeXML *xml;
-+  GtkBuilder *xml;
-   GtkWidget *child;
-   ContainerCreateInterfaceConnectInfo info;
-   va_list args;
-@@ -387,14 +390,16 @@
-   xml = mn_glade_xml_new(filename, child_name, NULL);
-   child = mn_glade_xml_get_widget(xml, child_name);
- 
--  if (GTK_IS_DIALOG(container))
--    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(container)->vbox), child, TRUE, TRUE, 0);
--  else
-+  if (GTK_IS_DIALOG(container)) {
-+    gtk_widget_unparent(child);
-+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(container))), child, TRUE, TRUE, 0);
-+  } else {
-     gtk_container_add(container, child);
-+  }
- 
-   info.container = container;
-   info.callback_prefix = callback_prefix;
--  glade_xml_signal_autoconnect_full(xml, create_interface_connect_cb, &info);
-+  gtk_builder_connect_signals_full(xml, create_interface_connect_cb, &info);
- 
-   va_start(args, callback_prefix);
- 
-@@ -422,7 +427,7 @@
- 
-   toplevel = gtk_widget_get_toplevel(widget);
- 
--  return GTK_WIDGET_TOPLEVEL(toplevel) ? GTK_WINDOW(toplevel) : NULL;
-+  return gtk_widget_get_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL;
- }
- 
- static void
-@@ -493,9 +498,11 @@
- 			       gpointer user_data)
- {
-   GtkAdjustment *adjustment;
-+  GtkAllocation allocation;
- 
-+  gtk_widget_get_allocation(widget, &allocation);
-   adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(widget));
--  gtk_adjustment_set_value(adjustment, (double) y / (widget->allocation.height - 2) * (adjustment->upper - adjustment->page_size));
-+  gtk_adjustment_set_value(adjustment, (double) y / (allocation.height - 2) * (gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment)));
- 
-   return TRUE;			/* we're forcibly in a drop zone */
- }
-@@ -562,7 +569,7 @@
- 	MNMailbox *mailbox;
- 
- 	/* text/x-moz-url is encoded in UCS-2 but in format 8: broken */
--	if (selection_data->format != 8 || selection_data->length <= 0 || (selection_data->length % 2) != 0)
-+	if (gtk_selection_data_get_format(selection_data) != 8 || gtk_selection_data_get_length(selection_data) <= 0 || (gtk_selection_data_get_length(selection_data) % 2) != 0)
- 	  {
- 	    mn_show_error_dialog(mn_widget_get_parent_window(widget),
- 				 _("A drag and drop error has occurred"),
-@@ -570,8 +577,8 @@
- 	    return;
- 	  }
- 
--	char_data = (const guint16 *) selection_data->data;
--	char_len = selection_data->length / 2;
-+	char_data = (const guint16 *) gtk_selection_data_get_data(selection_data);
-+	char_len = gtk_selection_data_get_length(selection_data) / 2;
- 
- 	url = g_string_new(NULL);
- 	for (i = 0; i < char_len && char_data[i] != '\n'; i++)
-@@ -1322,7 +1329,7 @@
- }
- 
- static void
--dialog_run_nonmodal_destroy_h (GtkObject *object, gpointer user_data)
-+dialog_run_nonmodal_destroy_h (GtkWidget *object, gpointer user_data)
- {
-   RunNonmodalInfo *info = user_data;
- 
-@@ -1375,7 +1382,7 @@
- 
-   g_object_ref(dialog);
- 
--  if (! GTK_WIDGET_VISIBLE(dialog))
-+  if (! gtk_widget_get_visible(dialog))
-     gtk_widget_show(GTK_WIDGET(dialog));
- 
-   g_object_connect(dialog,
---- src/mn-main.c.gtk3	2008-05-22 17:45:35.000000000 +0200
-+++ src/mn-main.c	2011-02-08 23:32:33.800030659 +0100
-@@ -21,7 +21,7 @@
- #include <stdlib.h>
- #include <signal.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include <libnotify/notify.h>
- #include <dbus/dbus-glib-lowlevel.h>
-@@ -452,7 +452,7 @@
- 
-   gnome_program_init(PACKAGE,
- 		     VERSION,
--		     LIBGNOMEUI_MODULE,
-+		     LIBGNOME_MODULE,
- 		     argc,
- 		     argv,
- 		     GNOME_PARAM_HUMAN_READABLE_NAME, _("Mail Notification"),
-@@ -460,6 +460,8 @@
- 		     GNOME_PARAM_GOPTION_CONTEXT, option_context,
- 		     NULL);
- 
-+  gtk_init(&argc, &argv);
-+
-   if (arg_version)
-     {
-       print_version();
-@@ -497,7 +499,9 @@
- 	  if (! gnome_vfs_init())
- 	    mn_show_fatal_error_dialog(NULL, _("Unable to initialize the GnomeVFS library."));
- 
-+#if 0
- 	  gnome_authentication_manager_init();
-+#endif
- 
- 	  /* must be called before init_gmime() */
- 	  mn_conf_init();
---- src/mn-conf.c.gtk3	2008-05-22 17:45:35.000000000 +0200
-+++ src/mn-conf.c	2011-02-07 20:07:01.630580132 +0100
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdarg.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- #include "mn-conf.h"
- #include "mn-shell.h"
---- data/mail-notification.desktop.in.orig	2011-07-08 13:46:52.327548264 +0200
-+++ data/mail-notification.desktop.in	2011-07-08 13:47:00.732704467 +0200
-@@ -5,7 +5,7 @@
- _Comment=Get notified when new mail arrives
- Type=Application
- Categories=GNOME;GTK;Network;Email;
--Exec=mail-notification --sm-disable
-+Exec=mail-notification
- Terminal=false
- StartupNotify=true
- X-GNOME-DocPath=mail-notification/mail-notification.xml
diff --git a/testing/mail-notification/mail-notification-5.4-icons.patch b/testing/mail-notification/mail-notification-5.4-icons.patch
deleted file mode 100644
index 48d54742a..000000000
--- a/testing/mail-notification/mail-notification-5.4-icons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c
---- mail-notification-5.4/src/mn-stock.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-stock.c	2010-05-24 19:36:03.000000000 +0400
-@@ -32,11 +32,11 @@
-     const char	*icon_name;
-     const char	*source_stock_id;
-   } icons[] = {
--    { MN_STOCK_MAIL,			NULL, "stock_mail" },
--    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
--    { MN_STOCK_LOCAL,			NULL, "stock_folder" },
--    { MN_STOCK_REMOTE,			NULL, "stock_internet" },
--    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
-+    { MN_STOCK_MAIL,			NULL, "mail-message-new" },
-+    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
-+    { MN_STOCK_LOCAL,			NULL, "folder" },
-+    { MN_STOCK_REMOTE,			NULL, "applications-internet" },
-+    { MN_STOCK_UNKNOWN,			NULL, "dialog-question" },
-     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
- #if WITH_GMAIL
-     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
-@@ -48,14 +48,14 @@
-     { MN_STOCK_HOTMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
- #endif
- #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
--    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
-+    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
- #endif
- #if WITH_EVOLUTION
-     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
- #endif
--    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
--    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
--    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
-+    { MN_STOCK_MAIL_READER,		NULL, "mail-unread" },
-+    { MN_STOCK_OPEN_MESSAGE,		NULL, "mail-read" },
-+    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
-   };
-   GtkIconFactory *factory;
-   GtkIconTheme *icon_theme;
diff --git a/testing/mail-notification/mail-notification-5.4-kde-trayicon.patch b/testing/mail-notification/mail-notification-5.4-kde-trayicon.patch
deleted file mode 100644
index a3bdc8372..000000000
--- a/testing/mail-notification/mail-notification-5.4-kde-trayicon.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
---- mail-notification-5.4/build/src/mn-shell.c	2010-10-11 17:45:23.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-10-11 17:45:48.000000000 +0400
-@@ -313,6 +313,29 @@
- #undef __GOB_FUNCTION__
- 
- static void 
-+mn_shell_init_icon_base (MNShell * self)
-+{
-+    g_return_if_fail (self != NULL);
-+    g_return_if_fail (MN_IS_SHELL (self));
-+
-+    self->icon = MN_MAIL_ICON(mn_mail_icon_new());
-+    mn_add_weak_pointer(&self->icon);
-+
-+    g_object_connect(self->icon,
-+                     "signal::activate", self_icon_activate_h, self,
-+                     "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self,
-+                     "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self,
-+                     "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self,
-+                     "swapped-signal::activate-update", self_update, self,
-+                     "signal::activate-properties", self_icon_activate_properties_h, self,
-+                     "signal::activate-help", self_icon_activate_help_h, self,
-+                     "signal::activate-about", self_icon_activate_about_h, self,
-+                     "swapped-signal::activate-remove", self_quit, self,
-+                     "signal::destroy", self_icon_destroy_h, self,
-+                     NULL);
-+}
-+
-+static void 
- mn_shell_init (MNShell * o G_GNUC_UNUSED)
- {
- #define __GOB_FUNCTION__ "MN:Shell::init"
-@@ -793,22 +816,7 @@
- {
- #line 360 "src/mn-shell.gob"
- 	
--    self->icon = MN_MAIL_ICON(mn_mail_icon_new());
--    mn_add_weak_pointer(&self->icon);
--
--    g_object_connect(self->icon,
--		     "signal::activate", self_icon_activate_h, self,
--		     "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self,
--		     "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self,
--		     "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self,
--		     "swapped-signal::activate-update", self_update, self,
--		     "signal::activate-properties", self_icon_activate_properties_h, self,
--		     "signal::activate-help", self_icon_activate_help_h, self,
--		     "signal::activate-about", self_icon_activate_about_h, self,
--		     "swapped-signal::activate-remove", self_quit, self,
--		     "signal::destroy", self_icon_destroy_h, self,
--		     NULL);
--
-+    mn_shell_init_icon_base(self);
-     self_update_sensitivity(self);
-     self_update_tooltip(self);
-     self_update_icon(self);
-@@ -1094,7 +1102,13 @@
-       }
-     else
-       {
--	gtk_widget_hide(GTK_WIDGET(self->icon));
-+	/* Re-create the icon as a regular gtk_widget_hide causes the
-+	 * icon to remain visible on non-GNOME environments. We can't
-+	 * use the callback self_icon_destroy_h here as it can cause an
-+	 * endless recursion */
-+	g_signal_handlers_disconnect_by_func(self->icon, self_icon_destroy_h, self);
-+	gtk_widget_destroy(GTK_WIDGET(self->icon));
-+	mn_shell_init_icon_base(self);
- 	mn_mail_icon_set_blinking(self->icon, FALSE);
-       }
-   }}
diff --git a/testing/mail-notification/mail-notification-5.4-libx11.patch b/testing/mail-notification/mail-notification-5.4-libx11.patch
deleted file mode 100644
index bb3574fda..000000000
--- a/testing/mail-notification/mail-notification-5.4-libx11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Link with libX11 explicitly.
-
---- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c
-+++ mail-notification-5.4.dfsg.1/jbsrc/jb.c
-@@ -445,6 +445,8 @@
- 
-   jb_compile_options_add_libs(object->compile_options, "-lm");
- 
-+  jb_compile_options_add_libs(object->compile_options, "-lX11");
-+
-   jb_compile_options_add_package(object->compile_options, "gettext");
-   jb_compile_options_add_package(object->compile_options, "gnome");
-   jb_compile_options_add_package(object->compile_options, "dbus");
diff --git a/testing/mail-notification/mail-notification-5.4-popup-attach.patch b/testing/mail-notification/mail-notification-5.4-popup-attach.patch
deleted file mode 100644
index b8d5f6a09..000000000
--- a/testing/mail-notification/mail-notification-5.4-popup-attach.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-popup.c mail-notification-5.4-OK/build/src/mn-popup.c
---- mail-notification-5.4/build/src/mn-popup.c	2008-05-22 19:47:49.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-popup.c	2010-10-11 17:42:32.000000000 +0400
-@@ -177,6 +177,29 @@
- #undef __GOB_FUNCTION__
- 
- static void 
-+mn_popup_wait_for_icon_to_become_ready (void)
-+{
-+    int x, y;
-+    int count = 0;
-+
-+    /* When the tray icon is created, it can still take some time before
-+     * it has arrived at the correct position. This is especially the case
-+     * on KDE environments. To work around this, add a little delay of at
-+     * most 2 seconds before showing a popup which is attached to the notification */
-+    do {
-+        gdk_window_get_origin (gtk_widget_get_window (mn_shell->icon), &x, &y);
-+
-+        if (x != 0 || y != 0) {
-+            break;
-+        }
-+
-+        g_usleep(G_USEC_PER_SEC / 10);
-+        count++;
-+    } while (count < 20);
-+}
-+
-+
-+static void 
- mn_popup_init (MNPopup * o G_GNUC_UNUSED)
- {
- #define __GOB_FUNCTION__ "MN:Popup::init"
-@@ -299,8 +322,10 @@
- 		 "icon-name", "stock_mail",
- 		 NULL);
- 
--    if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED)
-+    if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) {
-+      mn_popup_wait_for_icon_to_become_ready();
-       g_object_set(self, "attach-widget", mn_shell->icon, NULL);
-+    }
- 
-     g_string_free(body, TRUE);
- 
diff --git a/testing/mail-notification/mail-notification-5.4-sasl_encode64.patch b/testing/mail-notification/mail-notification-5.4-sasl_encode64.patch
deleted file mode 100644
index 80a7304d1..000000000
--- a/testing/mail-notification/mail-notification-5.4-sasl_encode64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c
---- mail-notification-5.4/build/src/mn-pop3-mailbox.c	2009-05-19 10:29:58.448201837 +0200
-+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c	2009-05-19 10:23:29.356204287 +0200
-@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS
- 
- 	if (initial_clientoutlen > 0)
- 	  {
--	    char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */
-+	    char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
- 	    unsigned int outlen;
- 	    int result;
- 	    char *str;
-diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c
---- mail-notification-5.4/src/mn-client-session.c	2008-05-22 17:45:35.000000000 +0200
-+++ mail-notification-5.4-OK/src/mn-client-session.c	2009-05-19 10:29:09.112211055 +0200
-@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession
- static int
- write_base64 (MNClientSession *session, const char *buf, unsigned int len)
- {
--  char buf64[len * 2];		/* Base64 is 33% larger than the data it encodes */
-+  char buf64[len * 2 + 1];		/* Base64 is 33% larger than the data it encodes */
-   unsigned int outlen;
-   int result;
-   char *str;
diff --git a/testing/mail-notification/mail-notification-5.4-weak.patch b/testing/mail-notification/mail-notification-5.4-weak.patch
deleted file mode 100644
index 2e2a233aa..000000000
--- a/testing/mail-notification/mail-notification-5.4-weak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
---- mail-notification-5.4/build/src/mn-shell.c	2008-05-22 19:47:49.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-05-24 19:39:48.000000000 +0400
-@@ -1008,6 +1008,7 @@
-     Self *self = user_data;
- 
-     /* The Notification Area applet has been terminated. Recreate the icon. */
-+    mn_remove_weak_pointer(&self->icon);
-     self_init_icon(self);
-   }}
- #line 1014 "mn-shell.c"
diff --git a/testing/mail-notification/mail-notification.install b/testing/mail-notification/mail-notification.install
deleted file mode 100644
index 21cd94399..000000000
--- a/testing/mail-notification/mail-notification.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=mail-notification
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1
-  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() {
-  kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/mail-notification/remove-ubuntu-special-case.patch b/testing/mail-notification/remove-ubuntu-special-case.patch
deleted file mode 100644
index 4516f32c6..000000000
--- a/testing/mail-notification/remove-ubuntu-special-case.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
-+++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
-@@ -164,8 +164,6 @@
- static void
- gconf_configure (void)
- {
--  JBVariable *variable;
--
-   jb_require_program("gconftool-2");
- 
-   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
-@@ -178,21 +176,6 @@
-       jb_variable_set_string("gconf-config-source", config_source);
-       g_free(config_source);
-     }
--
--  /* fix the default schemas dir on Ubuntu */
--  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
--  if (! variable->user_set)
--    {
--      static const char *ubuntu_dir = "$datadir/gconf/schemas";
--      char *expanded;
--
--      expanded = jb_variable_expand(ubuntu_dir, NULL);
--
--      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
--	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
--
--      g_free(expanded);
--    }
- }
- 
- static void
diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD
deleted file mode 100644
index cc524eb63..000000000
--- a/testing/mdadm/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 147000 2012-01-20 13:40:09Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-pkgname=mdadm
-pkgver=3.2.3
-pkgrel=1
-pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://neil.brown.name/blog/mdadm"
-groups=('base')
-conflicts=('mkinitcpio<0.7')
-depends=('glibc')
-backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
-        mdadm.conf 
-        mdadm_install
-        mdadm_hook
-        mdadm_udev_install
-        disable-werror.patch)
-
-install=mdadm.install
-replaces=('raidtools')
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
-         '6df172c8f77b280018cf87eb3d313f29'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '9b01e96b6c3c218fb61628c9281fe688'
-         'c8c0713f5c7da51822ee6f3911473a1c'
-         'cd258e1bf430c02a25f40b4329df9f57'
-         '4ad87b74a4bc9a34621280abe0e0c3e4')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i ../disable-werror.patch
-  make CXFLAGS="$CFLAGS"
-  # build static mdassemble for Arch's initramfs
-  make MDASSEMBLE_AUTO=1 mdassemble
-  
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
-  install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
-  install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
-  install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
-  install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev
-  # symlink for backward compatibility
-  ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
-}
diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch
deleted file mode 100644
index 50a33f19d..000000000
--- a/testing/mdadm/disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2011-06-17 09:38:03.269238332 +0200
-+++ Makefile	2011-06-17 09:38:14.122398837 +0200
-@@ -42,7 +42,7 @@
- 
- CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
--CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
-+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
- ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
- endif
diff --git a/testing/mdadm/linux-3.0.patch b/testing/mdadm/linux-3.0.patch
deleted file mode 100644
index cd9d5473c..000000000
--- a/testing/mdadm/linux-3.0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Fri, 17 Jun 2011 22:49:24 +1000
-Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
-
-The next version of Linux might be 3.0.  If it is, get_linux_version
-will fail.
-So make it more robust.
-
-Reported-by: Namhyung Kim <namhyung@gmail.com>
-Reported-by: Milan Broz <mbroz@redhat.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
----
- util.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/util.c b/util.c
-index 10bbe56..55d171a 100644
---- a/util.c
-+++ b/util.c
-@@ -146,16 +146,16 @@ int get_linux_version()
- {
- 	struct utsname name;
- 	char *cp;
--	int a,b,c;
-+	int a = 0, b = 0,c = 0;
- 	if (uname(&name) <0)
- 		return -1;
- 
- 	cp = name.release;
- 	a = strtoul(cp, &cp, 10);
--	if (*cp != '.') return -1;
--	b = strtoul(cp+1, &cp, 10);
--	if (*cp != '.') return -1;
--	c = strtoul(cp+1, NULL, 10);
-+	if (*cp == '.')
-+		b = strtoul(cp+1, &cp, 10);
-+	if (*cp == '.')
-+		c = strtoul(cp+1, &cp, 10);
- 
- 	return (a*1000000)+(b*1000)+c;
- }
--- 
-1.7.2.3
-
diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm
deleted file mode 100755
index e196f3642..000000000
--- a/testing/mdadm/mdadm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/mdadm`
-case "$1" in
-  start)
-    stat_busy "Starting mdadm RAID Monitor"
-    if [ -z "$PID" ]; then 
-       /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mdadm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mdadm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf
deleted file mode 100644
index 57bd4c683..000000000
--- a/testing/mdadm/mdadm.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# mdadm configuration file
-#
-# mdadm will function properly without the use of a configuration file,
-# but this file is useful for keeping track of arrays and member disks.
-# In general, a mdadm.conf file is created, and updated, after arrays
-# are created. This is the opposite behavior of /etc/raidtab which is
-# created prior to array construction.
-#
-#
-# the config file takes two types of lines:
-#
-#	DEVICE lines specify a list of devices of where to look for
-#	  potential member disks
-#
-#	ARRAY lines specify information about how to identify arrays so
-#	  so that they can be activated
-#
-
-
-# You can have more than one device line and use wild cards. The first 
-# example includes SCSI the first partition of SCSI disks /dev/sdb,
-# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second 
-# line looks for array slices on IDE disks.
-#
-#DEVICE /dev/sd[bcdjkl]1
-#DEVICE /dev/hda1 /dev/hdb1
-#
-# The designation "partitions" will scan all partitions found in
-# /proc/partitions
-DEVICE partitions
-
-
-# ARRAY lines specify an array to assemble and a method of identification.
-# Arrays can currently be identified by using a UUID, superblock minor number,
-# or a listing of devices.
-#
-#	super-minor is usually the minor number of the metadevice
-#	UUID is the Universally Unique Identifier for the array
-# Each can be obtained using
-#
-# 	mdadm -D <md>
-#
-# To capture the UUIDs for all your RAID arrays to this file, run these:
-#    to get a list of running arrays:
-#    # mdadm -D --scan >>/etc/mdadm.conf
-#    to get a list from superblocks:
-#    # mdadm -E --scan >>/etc/mdadm.conf
-#
-#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
-#ARRAY /dev/md1 super-minor=1
-#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
-#
-# ARRAY lines can also specify a "spare-group" for each array.  mdadm --monitor
-# will then move a spare between arrays in a spare-group if one array has a
-# failed drive but no spare
-#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1
-#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1
-#
-
-
-# When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program.  To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
-#
-# If the lines are not found, mdadm will exit quietly
-#MAILADDR root@mydomain.tld
-#PROGRAM /usr/sbin/handle-mdadm-events
diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install
deleted file mode 100644
index e8404c260..000000000
--- a/testing/mdadm/mdadm.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then
-    echo "Attention mdadm update:"
-    echo "raid_partitions hook has been replaced by the more powerfull mdadm hook."
-    echo "Please update your /etc/mkinitcpio.conf accordingly."
-  fi
-}
diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook
deleted file mode 100755
index 7b2dc1ad1..000000000
--- a/testing/mdadm/mdadm_hook
+++ /dev/null
@@ -1,44 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    input="$(cat /proc/cmdline)"
-    mdconfig="/etc/mdadm.conf"
-    # for partitionable raid, we need to load md_mod first!
-    modprobe md_mod 2>/dev/null
-    # If md is specified on commandline, create config file from those parameters.
-    if [ "$(echo $input | grep "md=")" ]; then
-        #Create initial mdadm.conf
-        # scan all devices in /proc/partitions
-        echo DEVICE partitions > $mdconfig
-        for i in $input; do 
-            case $i in
-                # raid 
-                md=[0-9]*,/*)
-                    device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device devices=$array" >> $mdconfig
-                    ;;
-                # partitionable raid
-                md=d[0-9]*,/*)
-                    device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device devices=$array" >> $mdconfig
-                    ;;
-                # raid UUID 
-                md=[0-9]*,[0-9,a-z]*)
-                    device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
-                    ;;
-                # partitionable raid UUID
-                md=d[0-9]*,[0-9,a-z]*)
-                    device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
-                    ;;
-            esac 
-        done
-    fi
-    # assemble everything
-    [ -e $mdconfig ] && /sbin/mdassemble
-}
diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install
deleted file mode 100644
index b53258676..000000000
--- a/testing/mdadm/mdadm_install
+++ /dev/null
@@ -1,45 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
-    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-    BINARIES=""
-    FILES=""
-    SCRIPT="mdadm"
-    # check if a custom mdadm.conf exists
-    if grep -q ^ARRAY /etc/mdadm.conf; then
-        echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
-        add_file "/etc/mdadm.conf"
-    fi
-    add_binary "/sbin/mdassemble"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for any raid root device,
-  and assembles the raid device when run.
-
-  If arrays are defined in /etc/mdadm.conf, the file will be used instead
-  of command line assembling.
-  
-  Command Line Setup:
-  - for raid arrays with persistent superblocks:
-    md=<md device no.>,dev0,dev1,...,devn
-    md=<md device no.>,uuid
-  - for partitionable raid arrays with persistent superblocks:
-    md=d<md device no.>,dev0,dev1,...,devn
-    md=d<md device no.>,uuid
-
-  Parameters:
-  - <md device no.> = the number of the md device: 
-    0 means md0, 1 means md1, ...
-  - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
-                   or 0900878d:f95f6057:c39a36e9:55efa60a
-  Examples:
-  - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
-    This will setup 2 md partitionable arrays.
-  - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
-    This will setup 2 md arrays with persistent superblocks.
-HELPEOF
-}
diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install
deleted file mode 100644
index 9fc161624..000000000
--- a/testing/mdadm/mdadm_udev_install
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
-    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-    BINARIES=""
-    FILES=""
-    SCRIPT=""
-    # check if a custom mdadm.conf exists
-    if grep -q ^ARRAY /etc/mdadm.conf; then
-        echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
-        add_file "/etc/mdadm.conf"
-    fi
-    add_binary "/sbin/mdadm"
-    add_file "/lib/udev/rules.d/64-md-raid.rules"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook loads raid arrays with udev.
-HELPEOF
-}
diff --git a/testing/moc/PKGBUILD b/testing/moc/PKGBUILD
deleted file mode 100644
index 741beee27..000000000
--- a/testing/moc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 146347 2012-01-09 18:52:49Z stephane $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20110528
-pkgrel=5
-pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
-arch=('i686' 'x86_64')
-url="http://moc.daper.net/"
-license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
-makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
-optdepends=('speex: for using the speex plugin' 
-	    'ffmpeg: for using the ffmpeg plugin'
-	    'taglib: for using the musepack plugin' 
-	    'libmpcdec: for using the musepack plugin' 
-            'wavpack: for using the wavpack plugin' 
-	    'libmodplug: for using the modplug plugin')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
-        gcc-undefined-symbols.diff moc-ffmpeg.patch)
-sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-          'a811a4ac7e049914aab528d3f06a6be6634c2720'
-          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p0 -i ../gcc-undefined-symbols.diff
-  patch -p0 -i ../moc-ffmpeg.patch
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  ./autogen.sh
-  ./configure --prefix=/usr --without-rcc --without-aac \
-    --with-oss  --with-alsa  --with-jack --with-mp3 \
-    --with-musepack --with-vorbis --with-flac --with-wavpack \
-    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-    --with-samplerate --with-curl --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/moc/gcc-undefined-symbols.diff b/testing/moc/gcc-undefined-symbols.diff
deleted file mode 100644
index 09e9b8bda..000000000
--- a/testing/moc/gcc-undefined-symbols.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- decoder.c~	2011-05-08 09:28:28.077137883 +0200
-+++ decoder.c	2011-05-10 21:40:48.887941968 +0200
-@@ -259,6 +259,9 @@
- 	for (i = 0; i < plugins_num; i++)
- 		if (plugins[i].decoder->destroy)
- 			plugins[i].decoder->destroy ();
-+	for (i = 0; i < plugins_num; i++)
-+		if (plugins[i].handle)
-+                    lt_dlclose(plugins[i].handle);
- 
- 	if (lt_dlexit())
- 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/testing/moc/moc-ffmpeg.patch b/testing/moc/moc-ffmpeg.patch
deleted file mode 100644
index 7554ea14e..000000000
--- a/testing/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -28,12 +28,6 @@
- #include <ffmpeg/avformat.h>
- #endif
- 
--/* libavformat's API will be changing at version 53, but at present there
-- * appears to be no guidance on what will replace the deprecated fields. */
--#ifndef FF_API_OLD_METADATA
--#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
--#endif
--
- /* FFmpeg also likes common names, without that, our common.h and log.h
-  * would not be included. */
- #undef COMMON_H
-@@ -137,7 +131,7 @@
- 	av_read_play (data->ic);
- 	for (i = 0; i < data->ic->nb_streams; i++) {
- 		data->enc = data->ic->streams[i]->codec;
--		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 			audio_index = i;
- 			break;
- 		}
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
deleted file mode 100644
index d7e723b01..000000000
--- a/testing/nilfs-utils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 146948 2012-01-19 15:15:14Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=nilfs-utils
-pkgver=2.1.1
-pkgrel=1
-pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
-url="http://www.nilfs.org/"
-license=('GPL2' 'LGPL2.1')
-backup=('etc/nilfs_cleanerd.conf')
-depends=('util-linux')
-options=(!libtool)
-source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('caa7d8b7121311bd978120e2f0c45d81')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --libdir=/lib --enable-libmount
-  make
-}
-
-package() {
-   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
-}
diff --git a/testing/openjdk6/glibc2_15.diff b/testing/openjdk6/glibc2_15.diff
deleted file mode 100644
index 8fe1b077a..000000000
--- a/testing/openjdk6/glibc2_15.diff
+++ /dev/null
@@ -1,236 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent  2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -34,8 +34,6 @@
- 
- // Portions of code courtesy of Clifford Click
- 
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
--
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
- // all inherited from this class.  The various identity values are supplied
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jniCheck.cpp
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnter.xsl
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnv.cpp
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiExport.cpp
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/runtime/interfaceSupport.hpp
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
\ No newline at end of file
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index 77702ee78..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 146349 2012-01-09 18:52:51Z stephane $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.28
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default ntlm.patch)
-sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
-          'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
-          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
-  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
-  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
-  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
-
-  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
-  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
-    --enable-ipv6 --enable-syslog --enable-local \
-    --enable-bdb --enable-hdb \
-    --enable-crypt --enable-dynamic \
-    --with-threads  --disable-wrappers \
-    --enable-spasswd --with-cyrus-sasl \
-    --enable-overlays=mod --enable-modules=yes
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make test
-}
-
-package_libldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'libfetch' 'e2fsprogs')
-  backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in include libraries doc/man/man3 ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
-  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
-  depends=("libldap>=${pkgver}" '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/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/openssl/PKGBUILD b/testing/openssl/PKGBUILD
deleted file mode 100644
index 61947c70f..000000000
--- a/testing/openssl/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 146800 2012-01-18 16:09:23Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=openssl
-_ver=1.0.0g
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
-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')
-md5sums=('07ecbe4324f140d157478637d6beccf1'
-         '34315cf0fbbd1d18435948eb9712fcdf'
-         '5bbc0655bda2af95bc8eb568963ce8ba'
-         'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-	cd $srcdir/$pkgname-$_ver
-
-	if [ "${CARCH}" == 'x86_64' ]; then
-		openssltarget='linux-x86_64'
-	elif [ "${CARCH}" == 'i686' ]; then
-		openssltarget='linux-elf'
-	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
-	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
-	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-		shared zlib enable-md2 \
-		"${openssltarget}" \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
-
-	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/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/oxine/PKGBUILD b/testing/oxine/PKGBUILD
deleted file mode 100644
index 6ccda1c01..000000000
--- a/testing/oxine/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 146255 2012-01-07 05:13:36Z eric $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Rouslan Solomakhin <rouslan@localnet.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=oxine
-pkgver=0.7.1
-pkgrel=5
-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/testing/pam/PKGBUILD b/testing/pam/PKGBUILD
deleted file mode 100644
index cf6f36b6d..000000000
--- a/testing/pam/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 146351 2012-01-09 18:52:53Z stephane $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.5
-pkgrel=2
-pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib' 'libtirpc')
-makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
-source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
-        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
-        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
-        other)
-options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
-         'e2788389a6c59224110a45fcff30e02b'
-         '6e6c8719e5989d976a14610f340bd33a')
-
-build() {
-  cd $srcdir/Linux-PAM-$pkgver
-  ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
-  make
-}
-
-package() {
-  cd $srcdir/Linux-PAM-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
-  install -D -m644 ../other $pkgdir/etc/pam.d/other
-  # build pam_unix2 module
-  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
-  cd $srcdir/pam_unix2-2.6
-  ./configure
-  make
-  make DESTDIR=$pkgdir install
-  # add the realtime permissions for audio users
-  sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
-  cat >>$pkgdir/etc/security/limits.conf <<_EOT
-*               -       rtprio          0
-*               -       nice            0
-@audio          -       rtprio          65
-@audio          -       nice           -10
-@audio          -       memlock         40000
-_EOT
-  # fix some missing symlinks from old pam for compatibility
-  cd $pkgdir/lib/security
-  ln -s pam_unix.so pam_unix_acct.so
-  ln -s pam_unix.so pam_unix_auth.so
-  ln -s pam_unix.so pam_unix_passwd.so
-  ln -s pam_unix.so pam_unix_session.so
-  # set unix_chkpwd uid
-  chmod +s $pkgdir/sbin/unix_chkpwd
-}
-md5sums=('927ee5585bdec5256c75117e9348aa47'
-         'e2788389a6c59224110a45fcff30e02b'
-         '6e6c8719e5989d976a14610f340bd33a')
diff --git a/testing/pam/other b/testing/pam/other
deleted file mode 100644
index 08498b423..000000000
--- a/testing/pam/other
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/pam/pam.install b/testing/pam/pam.install
deleted file mode 100644
index 9d4588084..000000000
--- a/testing/pam/pam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  # need to run this immediately -- pacman only runs it at the end of
-  # all package installs
-  /sbin/ldconfig -r .
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/perl-alien-sdl/PKGBUILD b/testing/perl-alien-sdl/PKGBUILD
deleted file mode 100644
index 8fa64cb8d..000000000
--- a/testing/perl-alien-sdl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147088 2012-01-21 18:19:18Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-# This package must not by "any" arch.
-# Requires rebuild with every change to sdl-config
-
-pkgname=perl-alien-sdl
-_realname=Alien-SDL
-pkgver=1.430
-pkgrel=1
-pkgdesc="Building, finding and using SDL binaries"
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-url="http://search.cpan.org/dist/Alien-SDL/"
-depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
-makedepends=(perl-file-which perl-text-patch)
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
-md5sums=('9d7774212fb4e1c46325746c953a808b')
-
-package() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor destdir="$pkgdir" --with-sdl-config
-
-  perl Build
-  perl Build install
-}
diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
deleted file mode 100644
index 1404460df..000000000
--- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
----
- .../lib/ExtUtils/CBuilder/Base.pm                  |    6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t                 |   25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
--  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
--  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index c3bf6b5..1bb15aa 100644
---- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
--- 
-1.7.4.4
-
diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog
deleted file mode 100644
index 9add39e20..000000000
--- a/testing/perl/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2011-06-22 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS
-    * Fixed #FS22197, FS#22441, FS#24767
-    * Rebuilt perl 5.14.1-2 against db 5.2.28
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Fixed #FS24660
-    * Rebuilt against db 5.2.28
-
-2011-05-16  Angel Velasquez <angvp@archlinux.org>
-    * perl 5.14.0
-    * Removed patch for h2ph warning from 5.12.3
-    * Removed provides array, you can use corelist -v 5.14.0 to know the
-    modules included with the perl core, through Module::CoreList (thx j3nnn1
-    for the tip)
-
-2010-11-07  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.2-1
-    - Using /usr/bin/*_perl for script directories
-
-2010-11-06  kevin  <kevin@archlinux.org>
-
-    - Removed otherlibdirs directive from Configure
-    - Removed /usr/*/perl5/site_perl/5.10.1 from INC
-    - Finally removed legacy dirs /usr/lib/perl5/current and
-      /usr/lib/perl5/site_perl/current from @INC
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-2
-    - Francois updated the provides array.
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-1
-
-2010-05-16  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-2
-
-2010-05-12  kevin  <kevin@archlinux.org>
-
-    - FS#19411.  Removed the for loop in perlbin.sh which didn't work on zsh.
-      This makes the loop variables unnecessary so the script no longer
-      pollutes the user's environment.
-    - FS#19427.  Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
-      user built modules.
-
-2010-05-09  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-1
-    - Modified perlbin.sh to only add existing dirs to PATH.  Fixes FS#17402,
-      path points to non-existant directories 
-
-2010-05-07  kevin  <kevin@archlinux.org>
-
-    - Added this changelog.
-    - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC.
-      This removes the duplicates and versioned directory entries.
-    - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
-      Fix FS#13808, binaries don't follow FHS.
-    - Stopped using versioned directories in sitelib and sitearch.
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD
deleted file mode 100644
index 73d4715af..000000000
--- a/testing/perl/PKGBUILD
+++ /dev/null
@@ -1,121 +0,0 @@
-# $Id: PKGBUILD 146806 2012-01-18 17:06:31Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: kevin <kevin.archlinux.org>
-# Contributor: judd <jvinet.zeroflux.org>
-# Contributor: francois <francois.archlinux.org> 
-pkgname=perl
-pkgver=5.14.2
-pkgrel=7
-pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
-perlbin.sh
-perlbin.csh
-provides.pl
-digest_eval_hole.diff
-0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
-install=perl.install
-options=('makeflags' '!purge')
-md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
-         '5ed2542fdb9a60682f215bd33701e61a'
-         '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '31fc0b5bb4935414394c5cfbec2cb8e5'
-         '490852b3d77c3b3866d0d75f5fbf5c5d'
-         'c25d86206d649046538c3daab7874564')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    # for x86_64
-    arch_opts="-Dcccdlflags='-fPIC'"
-  else 
-    # for i686
-    arch_opts=""
-  fi
-
-  patch -Np1 -i $srcdir/digest_eval_hole.diff
-
-  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
-    -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
-    -Dprivlib=/usr/share/perl5/core_perl \
-    -Darchlib=/usr/lib/perl5/core_perl \
-    -Dsitelib=/usr/share/perl5/site_perl \
-    -Dsitearch=/usr/lib/perl5/site_perl \
-    -Dvendorlib=/usr/share/perl5/vendor_perl \
-    -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dscriptdir=/usr/bin/core_perl \
-    -Dsitescript=/usr/bin/site_perl \
-    -Dvendorscript=/usr/bin/vendor_perl \
-    -Dinc_version_list=none \
-    -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \
-    -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}"
-  patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
-#  make test
-}
-
-package() {
-  # hack to work around makepkg running the subshell in check_sanity()
-  new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
-  provides=(${new_provides[@]})
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install
-
-  ### Perl Settings ###
-  # Change man page extensions for site and vendor module builds.
-  # Use archlinux email address instead of my own.
-  sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
-      -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
-      -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
-      -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
-
-  ### CPAN Settings ###
-  # Set CPAN default config to use the site directories.
-  sed -e '/(makepl_arg =>/   s/""/"INSTALLDIRS=site"/' \
-      -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
-
-  ### CPANPLUS Settings ###
-  # Set CPANPLUS default config to use the site directories.
-  sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
-      -e "/{'buildflags'}/     s/'';/'installdirs=site';/" \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
-
-  # Profile script to set paths to perl scripts.
-  install -D -m755 ${srcdir}/perlbin.sh \
-                   ${pkgdir}/etc/profile.d/perlbin.sh
-  # Profile script to set paths to perl scripts on csh. (FS#22441) 
-  install -D -m755 ${srcdir}/perlbin.csh \
-                  ${pkgdir}/etc/profile.d/perlbin.csh
-
-  (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
-  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct; ln -sf s2p psed)
-  grep -Rl "${pkgdir}" ${pkgdir}/usr | \
-      xargs sed -i "s^${pkgdir}^^g"
-
-  # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
-  # (FS#16488)
-  rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
-  for d in $pkgdir/usr/share/perl5/core_perl/*; do
-    if [ -d $d -a $(basename $d) != "pod" ]; then
-      find $d -name *.pod -delete
-    fi
-  done
-  find $pkgdir/usr/lib -name *.pod -delete
-  find $pkgdir -name .packlist -delete
-  # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) 
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf
-}
diff --git a/testing/perl/digest_eval_hole.diff b/testing/perl/digest_eval_hole.diff
deleted file mode 100644
index 47904137b..000000000
--- a/testing/perl/digest_eval_hole.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001
-From: "Michael G. Schwern" <schwern@pobox.com>
-Date: Mon, 3 Oct 2011 19:05:29 +0100
-Subject: Close the eval "require $module" security hole in
- Digest->new($algorithm)
-
-Also the filter was incomplete.
-
-Bug-Debian: http://bugs.debian.org/644108
-
-Patch-Name: fixes/digest_eval_hole.diff
----
- cpan/Digest/Digest.pm    |    6 ++++--
- cpan/Digest/t/security.t |   14 ++++++++++++++
- 2 files changed, 18 insertions(+), 2 deletions(-)
- create mode 100644 cpan/Digest/t/security.t
-
-diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm
-index 384dfc8..d714434 100644
---- a/cpan/Digest/Digest.pm
-+++ b/cpan/Digest/Digest.pm
-@@ -24,7 +24,7 @@ sub new
-     shift;  # class ignored
-     my $algorithm = shift;
-     my $impl = $MMAP{$algorithm} || do {
--	$algorithm =~ s/\W+//;
-+	$algorithm =~ s/\W+//g;
- 	"Digest::$algorithm";
-     };
-     $impl = [$impl] unless ref($impl);
-@@ -35,7 +35,9 @@ sub new
- 	($class, @args) = @$class if ref($class);
- 	no strict 'refs';
- 	unless (exists ${"$class\::"}{"VERSION"}) {
--	    eval "require $class";
-+	    my $pm_file = $class . ".pm";
-+	    $pm_file =~ s{::}{/}g;
-+	    eval { require $pm_file };
- 	    if ($@) {
- 		$err ||= $@;
- 		next;
-diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t
-new file mode 100644
-index 0000000..5cba122
---- /dev/null
-+++ b/cpan/Digest/t/security.t
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env perl
-+
-+# Digest->new() had an exploitable eval
-+
-+use strict;
-+use warnings;
-+
-+use Test::More tests => 1;
-+
-+use Digest;
-+
-+$LOL::PWNED = 0;
-+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) };
-+is $LOL::PWNED, 0;
diff --git a/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch
deleted file mode 100644
index a2d176ec6..000000000
--- a/testing/perl/fix-h2ph-and-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker@cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH 1/1] Fix h2ph and test
-
----
- lib/h2ph.t    |   12 ++++++++++--
- utils/h2ph.PL |   28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
-     exit 0;
- }
- 
--plan(4);
-+plan(5);
- 
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
-                    stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
- 
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+                   switches => ['-c'],
-+                   stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"], 
--                   prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+                   stderr => 1,
-+                   prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
- 
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
- 
- sub expr {
--    $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+    if (/\b__asm__\b/) {	# freak out
-+	$new = '"(assembly code)"';
-+	return
-+    }
-     my $joined_args;
-     if(keys(%curargs)) {
- 	$joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
-     # Increment $VERSION every time this function is modified:
--    my $VERSION     = 2;
-+    my $VERSION     = 3;
-     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
- 
-     # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- 		# parenthesized value:  d=(v)
- 		$define{$_} = $1;
- 	    }
--	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+	    if (/^(\w+)\((\w)\)$/) {
-+		my($macro, $arg) = ($1, $2);
-+		my $def = $define{$_};
-+		$def =~ s/$arg/\$\{$arg\}/g;
-+		print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+	    } elsif
-+		($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- 		# float:
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
- 	    } elsif ($define{$_} =~ /^\w+$/) {
--		print PREAMBLE
--		    "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+		my $def = $define{$_};
-+		if ($isatype{$def}) {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+		} else {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+	        }
- 	    } else {
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { \"",
--- 
-1.6.5.2.74.g610f9.dirty
-
diff --git a/testing/perl/perl.install b/testing/perl/perl.install
deleted file mode 100644
index a355c5bbe..000000000
--- a/testing/perl/perl.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
-    [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
-    [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
-    [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
-  done
-  return 0
-}
-
diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh
deleted file mode 100644
index 535f0b18d..000000000
--- a/testing/perl/perlbin.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh
deleted file mode 100755
index 20f830436..000000000
--- a/testing/perl/perlbin.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl
-
-export PATH
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
-
diff --git a/testing/perl/provides.pl b/testing/perl/provides.pl
deleted file mode 100644
index 3bf369577..000000000
--- a/testing/perl/provides.pl
+++ /dev/null
@@ -1,286 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl.
-#
-# Justin Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
-    my ($path, $mod) = @_;
-    $mod ||= "";
-
-    open my $fh, '<', $path or die "open $path: $!";
-
-    while (<$fh>) {
-        next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/;
-        my $ver = eval $1;
-        return $ver unless $@;
-        warn qq{$path:$. bad version string "$ver"\n};
-    }
-
-    close $fh;
-    return undef;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
-    my ($dist, $dir) = @_;
-
-    # libpath is the modern style, installing modules under lib/
-    # with dirs matching the name components.
-    my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
-    # dumbpath is an old style where there's no subdirs and just
-    # a .pm file.
-    my $dumbpath = $dist;
-    $dumbpath =~ s/\A.+-//;
-    $dumbpath .= ".pm";
-
-    my @paths = ($libpath, $dumbpath);
-    # Some modules (with simple names like XSLoader, lib, etc) are
-    # generated by Makefile.PL. Search through their generating code.
-    push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
-    for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
-    return undef;
-}
-
-sub module_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = maindistfile($dist, $dir) or return undef;
-
-    my $mod = $dist;
-    $mod =~ s/-/::/g;
-    my $ver = Common::evalver($path, $mod);
-    unless ($ver) {
-        warn "failed to find version in module file for $dist\n";
-        return undef;
-    }
-
-    return $ver;
-}
-
-sub changelog_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path;
-    for my $tmp (glob "$dir/{Changes,ChangeLog}") {
-        if (-f $tmp) { $path = $tmp; last; }
-    }
-    return undef unless $path;
-
-    open my $fh, '<', $path or die "open: $!";
-    while (<$fh>) {
-        return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
-        return $1 if /\A\s*version\s+([0-9._]+)/i;
-    }
-    close $fh;
-
-    return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = "$dir/VERSION";
-    return undef unless -f $path; # no warning, only podlaters has it
-
-    return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
-    my ($distroot) = @_;
-    opendir my $cpand, "$distroot" or die "failed to open $distroot";
-    my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
-    closedir $cpand;
-
-    my @found;
-    for my $dist (@dists) {
-        my $distdir = "$distroot/$dist";
-        my $ver = (module_ver($dist, $distdir)
-                   || changelog_ver($dist, $distdir)
-                   || verfile_ver($dist, $distdir));
-
-        if ($ver) { push @found, [ $dist, $ver ]; }
-        else { warn "failed to find version for $dist\n"; }
-    }
-    return @found;
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
-    my ($module) = @_;
-    my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module";
-    my $http = HTTP::Tiny->new;
-    my $resp = $http->get($url);
-    return undef unless $resp->{'success'};
-
-    my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
-        or return undef;
-
-    my $dist = $cpanpath;
-    $dist =~ s{\A.+/}{};    # remove author directory
-    $dist =~ s{-[^-]+\z}{}; # remove version and extension
-    return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    my $libdir = "$srcdir/lib/";
-    die "failed to find $libdir directory" unless -d $libdir;
-
-    # Find only the module files that have not changed since perl
-    # was extracted. We don't want the files perl just recently
-    # installed into lib/. We processed those already.
-    my @modfiles;
-    my $finder = sub {
-        return unless /[.]pm\z/;
-        push @modfiles, $_;
-    };
-    findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
-    # First we have to find what the oldest ctime actually is.
-    my $oldest = time;
-    @modfiles = map {
-        my $modfile = $_;
-        my $ctime = (stat $modfile)->ctime;
-        $oldest = $ctime if $ctime < $oldest;
-        [ $modfile, $ctime ]; # save ctime for later
-    } @modfiles;
-
-    # Then we filter out any file that was created more than a
-    # few seconds after that. Process the rest.
-    my @mods;
-    for my $modfile (@modfiles) {
-        my ($mod, $ctime) = @$modfile;
-        next if $ctime - $oldest > 5; # ignore newer files
-
-        my $path = $mod;
-        $mod =~ s{[.]pm\z}{};
-        $mod =~ s{\A$libdir}{};
-        $mod =~ s{/}{::}g;
-
-        my $ver = Common::evalver($path) || q{};
-        push @mods, [ $mod, $ver ];
-    }
-
-    # Convert modules names to the dist names who provide them.
-    my %seen;
-    my @dists;
-    for my $modref (@mods) {
-        my ($mod, $ver) = @$modref;
-        my $dist = cpan_provider($mod) or next; # filter out core modules
-        next if $seen{$dist}++;                 # avoid duplicate dists
-        push @dists, [ $dist, $ver ];
-    }
-    return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
-    my ($name) = @_;
-    my $orig = $name;
-
-    # Package names should be lowercase and consist of alphanumeric
-    # characters only (and hyphens!)...
-    $name =~ tr/A-Z/a-z/;
-    $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
-    $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
-    $name =~ tr/-/-/s;
-
-    # Delete leading or trailing hyphens...
-    $name =~ s/\A-|-\z//g;
-
-    die qq{Dist. name '$orig' completely violates packaging standards}
-        unless $name;
-
-    return "perl-$name";
-}
-
-sub version
-{
-    my ($version) = @_;
-
-    # Package versions should be numbers and decimal points only...
-    $version =~ tr/-/./;
-    $version =~ tr/_0-9.-//cd;
-
-    # Remove developer versions because pacman has no special logic
-    # to compare them to regular versions like perl does.
-    $version =~ s/_[^_]+\z//;
-
-    $version =~ tr/_//d;  # delete other underscores
-    $version =~ tr/././s; # only one period at a time
-    $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
-    return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
-                'Text-Tabs' => 'Text-Tabs+Wrap',
-                'Cwd'       => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
-    my $name = $dist->[0];
-    $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
-    my ($name, $ver) = @$_;
-    $name = Dist2Pkg::name($name);
-    $ver  = Dist2Pkg::version($ver);
-    [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
-    my ($name, $ver) = @$pkg;
-    print "$name=$ver\n";
-}
diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD
deleted file mode 100644
index 1b9ae4026..000000000
--- a/testing/postfix/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 146357 2012-01-09 18:53:07Z stephane $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.8.7
-pkgrel=2
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
-        'aliases.patch' \
-        'rc.d')
-sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make makefiles DEBUG='' CCARGS=' \
-		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
-		-DHAS_LDAP \
-		-DUSE_TLS \
-		-DHAS_MYSQL -I/usr/include/mysql \
-		-DHAS_PGSQL -I/usr/include/postgresql \
-		-DHAS_SQLITE \
-	' AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
-		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
-	' OPT="${CFLAGS} ${LDFLAGS}"
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man"
-
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	cd "${pkgdir}"
-	patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/testing/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig	2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf	2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/testing/postfix/install b/testing/postfix/install
deleted file mode 100644
index c276e0919..000000000
--- a/testing/postfix/install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
-	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
-	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
-	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
-
-==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because of an inter-daemon protocol change.
-
-EOF
-	fi
-}
-
-pre_remove() {
-	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
-	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
-	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/testing/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD
deleted file mode 100644
index 6053b3214..000000000
--- a/testing/pyalpm/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-
-pkgname=pyalpm
-pkgver=0.5.3
-pkgrel=1
-pkgdesc="Libalpm bindings for Python 3"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/users/remy/pyalpm.git/"
-license=('GPL')
-depends=('python>=3.2' 'pacman>=4')
-source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz")
-md5sums=('a76019106d17de3a5933c773013a63d1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python setup.py build
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python setup.py install --root=${pkgdir}
-}
-
diff --git a/testing/redland/PKGBUILD b/testing/redland/PKGBUILD
deleted file mode 100644
index d242c7912..000000000
--- a/testing/redland/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 146359 2012-01-09 18:53:10Z stephane $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org> 
-
-pkgbase=redland
-epoch=1
-pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.15
-pkgrel=3
-url="http://librdf.org/"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
-options=('!libtool')
-source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
-        rpath.diff)
-sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af'
-          '3aeef38a7247ae33db6a0a19511ef4132240164b'
-          'f5db05c925b6bcd6402d5abd75c648b137f069c7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--enable-release \
-	--disable-static \
-	--with-raptor=system \
-	--with-rasqal=system \
-	--with-sqlite=3
-
-  # nuke rpath
-  patch -Np0 -i "${srcdir}/rpath.diff"
-
-  make
-}
-
-package_redland() {
- pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl')
- 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/redland"
-}
-
-package_redland-storage-mysql() {
- pkgdesc="MySQL storage support for Redland"
- depends=('redland' 'libmysqlclient')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_mysql.so "${pkgdir}/usr/lib/redland/librdf_storage_mysql.so"
-}
-
-package_redland-storage-postgresql() {
- pkgdesc="PostgreSQL storage support for Redland"
- depends=('redland' 'postgresql-libs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_postgresql.so "${pkgdir}/usr/lib/redland/"
-}
-
-package_redland-storage-virtuoso() {
- pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_virtuoso.so "${pkgdir}/usr/lib/redland/"
-}
-
-package_redland-storage-sqlite() {
- pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
- 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/lib/redland"
-  install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/"
-}
diff --git a/testing/redland/rpath.diff b/testing/redland/rpath.diff
deleted file mode 100644
index 831bc80ed..000000000
--- a/testing/redland/rpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool	2011-02-20 10:46:47.000000000 +0100
-+++ libtool.new	2011-02-20 10:52:58.285764909 +0100
-@@ -324,7 +324,7 @@
- 
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
-+hardcode_libdir_flag_spec=" "
- 
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
diff --git a/testing/rpcbind/PKGBUILD b/testing/rpcbind/PKGBUILD
deleted file mode 100644
index 3643fd34a..000000000
--- a/testing/rpcbind/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 146537 2012-01-12 16:56:40Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=rpcbind
-pkgver=0.2.0
-pkgrel=6
-pkgdesc="portmap replacement which supports RPC over various protocols"
-arch=(i686 x86_64)
-depends=('bash' 'glibc' 'libtirpc')
-url="http://rpcbind.sourceforge.net"
-license=('custom')
-replaces=('portmap')
-source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
-        rpcbind-sunrpc.patch
-        rpcbind)
-md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
-         'c02ac36a98baac70b8a26190524b7b73'
-         '78a963654f57cbb209e228884767836e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch for iana services file
-  patch -Np1 -i ../rpcbind-sunrpc.patch
-  ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run
-  make
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # install missing man page - https://bugs.archlinux.org/task/21271
-  install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/
-  # install daemon 
-  install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind
-  # install license
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING
-}
diff --git a/testing/rpcbind/rpcbind b/testing/rpcbind/rpcbind
deleted file mode 100755
index 87c5b50da..000000000
--- a/testing/rpcbind/rpcbind
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$(pidof -o %PPID /usr/bin/rpcbind)"
-case "$1" in
-  start)
-    stat_busy "Starting rpcbind"
-    [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/rpcbind)
-      echo $PID > /var/run/rpcbind.pid
-      add_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping rpcbind"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/rpcbind.pid
-      rm_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/rpcbind/rpcbind-sunrpc.patch b/testing/rpcbind/rpcbind-sunrpc.patch
deleted file mode 100644
index 76cf54ba9..000000000
--- a/testing/rpcbind/rpcbind-sunrpc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- rpcbind-0.1.7/src/rpcbind.c.orig	2008-11-19 14:17:34.000000000 +0100
-+++ rpcbind-0.1.7/src/rpcbind.c	2010-01-07 13:03:37.416632894 +0100
-@@ -114,7 +114,7 @@
- char *udp_uaddr;	/* Universal UDP address */
- char *tcp_uaddr;	/* Universal TCP address */
- #endif
--static char servname[] = "rpcbind";
-+static char servname[] = "sunrpc";
- static char superuser[] = "superuser";
- 
- int main __P((int, char *[]));
---- rpcbind-0.1.7/src/rpcinfo.c~	2010-01-08 16:14:24.592156602 +0000
-+++ rpcbind-0.1.7/src/rpcinfo.c	2010-01-08 16:14:31.578838609 +0000
-@@ -633,7 +633,7 @@
- 	{
- 	  memset (&hints, 0, sizeof hints);
- 	  hints.ai_family = AF_INET;
--	  if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 &&
-+	  if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 &&
-               (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0)
- 	    {
- 	      fprintf (stderr, "rpcinfo: %s: %s\n",
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
deleted file mode 100644
index 225d6dd59..000000000
--- a/testing/ruby/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 146361 2012-01-09 18:53:12Z stephane $
-# Maintainer:
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-pkgbase=ruby
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p0
-pkgrel=3
-pkgdesc="An object-oriented language for quick and easy programming"
-arch=('i686' 'x86_64')
-url="http://www.ruby-lang.org/en/"
-license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
-options=('!emptydirs' '!makeflags')
-source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
-sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
-      --enable-shared --enable-pthread --disable-rpath
-  make
-}
-
-package_ruby() {
-  depends=('openssl' 'libffi' 'libyaml')
-  provides=('rubygems' 'rake')
-  conflicts=('rake')
-  optdepends=('tk: for Ruby/TK')
-
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-nodoc
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
-}
-
-package_ruby-docs() {
-  pkgdesc="Documentation files for ruby"
-
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-doc install-capi
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
-}
diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD
deleted file mode 100644
index a42ce8523..000000000
--- a/testing/run-parts/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148442 2012-01-31 23:41:09Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=run-parts
-pkgver=4.2.1
-pkgrel=1
-pkgdesc='run scripts or programs in a directory'
-arch=('i686' 'x86_64')
-url='http://packages.qa.debian.org/d/debianutils.html'
-license=('GPL')
-depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz")
-sha256sums=('6359b273bee9b959d243d1490caa8f0f5ff8dc294690b1bdb5df755d6364be0f')
-
-build() {
-	cd $srcdir/debianutils-$pkgver
-	./configure --prefix=/usr
-	make run-parts
-}
-
-package() {
-	cd $srcdir/debianutils-$pkgver
-	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
-	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
-	for l in po4a/*/run-parts.8; do
-		install -D -m644  ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8
-	done
-}
diff --git a/testing/sdparm/PKGBUILD b/testing/sdparm/PKGBUILD
deleted file mode 100644
index 02c99e27d..000000000
--- a/testing/sdparm/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148024 2012-01-30 01:53:05Z stephane $
-# Maintainer:
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: grimi@poczta.fm
-
-pkgname=sdparm
-pkgver=1.07
-pkgrel=1
-pkgdesc="An utility similar to hdparm but for SCSI devices"
-arch=('i686' 'x86_64')
-url="http://sg.danny.cz/sg/sdparm.html"
-license=('BSD')
-depends=('glibc')
-source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz")
-md5sums=('c807f9db3dd7af175214be0d7fece494')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 COPYING \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
deleted file mode 100644
index 7c8032fc7..000000000
--- a/testing/sqlite3/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 146781 2012-01-17 16:20:13Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3071000
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}	#3070700
-#pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.10
-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=('9ed2ca93577b58cfa0d01f64b9312ab9'
-         'd4c8070ea2cec54b77002c265e680b0f'
-         '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 6ee0d6718..000000000
--- a/testing/subversion/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 146363 2012-01-09 18:53:15Z stephane $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.2
-pkgrel=2
-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=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
-          '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
-          '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 c3f098779..000000000
--- a/testing/sudo/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 148394 2012-01-31 03:32:26Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sudo
-_ver=1.8.3p2
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
-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=('6d4282a1530c541f7900fa8dfcf2a882'
-         '07e3c5c79d78db50674d5ad17963d631'
-         '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
-
-build() {
-  cd "$srcdir/$pkgname-$_ver"
-
-  ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
-    --with-env-editor --with-all-insults --with-logfac=auth
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_ver"
-  install -dm755 "$pkgdir/var/lib"
-
-  make DESTDIR="$pkgdir" install
-  chmod 755 $pkgdir/var/db
-
-  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/systemd/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch b/testing/systemd/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
deleted file mode 100644
index 456d679ed..000000000
--- a/testing/systemd/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 11 Jan 2012 22:07:35 +0100
-Subject: [PATCH] tmpfiles: fix parsing of /proc/net/unix on 32Bit machines
-
-Tracked down by Michael Meeks
----
- src/tmpfiles.c |   30 ++++++++++++++++++++----------
- 1 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/tmpfiles.c b/src/tmpfiles.c
-index 19a7c08..44e5c9d 100644
---- a/src/tmpfiles.c
-+++ b/src/tmpfiles.c
-@@ -117,41 +117,50 @@ static void load_unix_sockets(void) {
-         /* We maintain a cache of the sockets we found in
-          * /proc/net/unix to speed things up a little. */
- 
--        if (!(unix_sockets = set_new(string_hash_func, string_compare_func)))
-+        unix_sockets = set_new(string_hash_func, string_compare_func);
-+        if (!unix_sockets)
-                 return;
- 
--        if (!(f = fopen("/proc/net/unix", "re")))
-+        f = fopen("/proc/net/unix", "re");
-+        if (!f)
-                 return;
- 
--        if (!(fgets(line, sizeof(line), f)))
-+        /* Skip header */
-+        if (!fgets(line, sizeof(line), f))
-                 goto fail;
- 
-         for (;;) {
-                 char *p, *s;
-                 int k;
- 
--                if (!(fgets(line, sizeof(line), f)))
-+                if (!fgets(line, sizeof(line), f))
-                         break;
- 
-                 truncate_nl(line);
- 
--                if (strlen(line) < 53)
-+                p = strchr(line, ':');
-+                if (!p)
-+                        continue;
-+
-+                if (strlen(p) < 37)
-                         continue;
- 
--                p = line + 53;
-+                p += 37;
-                 p += strspn(p, WHITESPACE);
--                p += strcspn(p, WHITESPACE);
-+                p += strcspn(p, WHITESPACE); /* skip one more word */
-                 p += strspn(p, WHITESPACE);
- 
-                 if (*p != '/')
-                         continue;
- 
--                if (!(s = strdup(p)))
-+                s = strdup(p);
-+                if (!s)
-                         goto fail;
- 
-                 path_kill_slashes(s);
- 
--                if ((k = set_put(unix_sockets, s)) < 0) {
-+                k = set_put(unix_sockets, s);
-+                if (k < 0) {
-                         free(s);
- 
-                         if (k != -EEXIST)
-@@ -1059,7 +1068,8 @@ int main(int argc, char *argv[]) {
-         Item *i;
-         Iterator iterator;
- 
--        if ((r = parse_argv(argc, argv)) <= 0)
-+        r = parse_argv(argc, argv);
-+        if (r <= 0)
-                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- 
-         log_set_target(LOG_TARGET_AUTO);
--- 
-1.7.8.3
-
diff --git a/testing/systemd/0001-units-make-sure-syslog-socket-goes-away-early-during.patch b/testing/systemd/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
deleted file mode 100644
index 49248a6a4..000000000
--- a/testing/systemd/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ead51eb4ed55981f290e40a871ffbca6480c4cd3 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 12 Jan 2012 04:34:50 +0100
-Subject: [PATCH] units: make sure syslog socket goes away early during
- shutdown
-
----
- units/syslog.socket |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/units/syslog.socket b/units/syslog.socket
-index 323fa86..657e791 100644
---- a/units/syslog.socket
-+++ b/units/syslog.socket
-@@ -11,6 +11,8 @@
- Description=Syslog Socket
- DefaultDependencies=no
- Before=sockets.target syslog.target
-+Conflicts=shutdown.target
-+Before=shutdown.target
- 
- # Pull in syslog.target to tell people that /dev/log is now accessible
- Wants=syslog.target
--- 
-1.7.8.3
-
diff --git a/testing/totem-plparser/PKGBUILD b/testing/totem-plparser/PKGBUILD
deleted file mode 100644
index f63b5c140..000000000
--- a/testing/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146624 2012-01-14 12:24:19Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=2.32.6
-pkgrel=3
-url="http://www.hadess.net/totem.php3"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874')
-
-build() {
-  cd "$srcdir/totem-pl-parser-$pkgver"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd "$srcdir/totem-pl-parser-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch b/testing/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
deleted file mode 100644
index 3ff89ae43..000000000
--- a/testing/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Wed, 18 Jan 2012 05:06:18 +0100
-Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
-
-Some broken kernel drivers load firmware synchronously in the module init
-path and block modprobe until the firmware request is fulfilled.
-
-The modprobe-generated firmware request is a direct child device of the
-device which caused modprobe to run. Child device event are blocked until
-the parent device is handled. This dead-locks until the kernel firmware
-loading timeout of 60 seconds is reached.
-
-The hanging modprobe event should now time-out and allow the firmware
-event to run before the 60 second kernel timeout.
----
- src/udev-event.c |    2 +-
- src/udevd.c      |   62 +++++++++++++++++++++++++++++++++++++++++++----------
- 2 files changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/udev-event.c b/src/udev-event.c
-index 9bdc518..f0b9548 100644
---- a/src/udev-event.c
-+++ b/src/udev-event.c
-@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
-         udev_list_init(udev, &event->run_list, false);
-         event->fd_signal = -1;
-         event->birth_usec = now_usec();
--        event->timeout_usec = 60 * 1000 * 1000;
-+        event->timeout_usec = 30 * 1000 * 1000;
-         dbg(event->udev, "allocated event %p\n", event);
-         return event;
- }
-diff --git a/src/udevd.c b/src/udevd.c
-index 11ab19a..77a1e79 100644
---- a/src/udevd.c
-+++ b/src/udevd.c
-@@ -133,6 +133,7 @@ struct worker {
-         struct udev_monitor *monitor;
-         enum worker_state state;
-         struct event *event;
-+        unsigned long long event_start_usec;
- };
- 
- /* passed from worker to main process */
-@@ -372,6 +373,7 @@ out:
-                 close(fd_inotify);
-                 close(worker_watch[WRITE_END]);
-                 udev_rules_unref(rules);
-+                udev_builtin_exit(udev);
-                 udev_monitor_unref(worker_monitor);
-                 udev_unref(udev);
-                 udev_log_close();
-@@ -389,6 +391,7 @@ out:
-                 worker->monitor = worker_monitor;
-                 worker->pid = pid;
-                 worker->state = WORKER_RUNNING;
-+                worker->event_start_usec = now_usec();
-                 worker->event = event;
-                 event->state = EVENT_RUNNING;
-                 udev_list_node_append(&worker->node, &worker_list);
-@@ -419,6 +422,7 @@ static void event_run(struct event *event)
-                 worker_ref(worker);
-                 worker->event = event;
-                 worker->state = WORKER_RUNNING;
-+                worker->event_start_usec = now_usec();
-                 event->state = EVENT_RUNNING;
-                 return;
-         }
-@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
-                                 continue;
- 
-                         /* worker returned */
--                        worker->event->exitcode = msg.exitcode;
--                        event_queue_delete(worker->event, true);
--                        worker->event = NULL;
-+                        if (worker->event) {
-+                                worker->event->exitcode = msg.exitcode;
-+                                event_queue_delete(worker->event, true);
-+                                worker->event = NULL;
-+                        }
-                         if (worker->state != WORKER_KILLED)
-                                 worker->state = WORKER_IDLE;
-                         worker_unref(worker);
-@@ -796,7 +802,7 @@ static void handle_signal(struct udev *udev, int signo)
-                                 }
- 
-                                 if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
--                                        if (worker->event != NULL) {
-+                                        if (worker->event) {
-                                                 err(udev, "worker [%u] failed while handling '%s'\n",
-                                                     pid, worker->event->devpath);
-                                                 worker->event->exitcode = -32;
-@@ -1574,25 +1580,57 @@ int main(int argc, char *argv[])
-                                 break;
- 
-                         /* timeout at exit for workers to finish */
--                        timeout = 60 * 1000;
--                } else if (udev_list_node_is_empty(&event_list) && children > 2) {
--                        /* set timeout to kill idle workers */
--                        timeout = 3 * 1000;
--                } else {
-+                        timeout = 30 * 1000;
-+                } else if (udev_list_node_is_empty(&event_list) && children <= 2) {
-+                        /* we are idle */
-                         timeout = -1;
-+                } else {
-+                        /* kill idle or hanging workers */
-+                        timeout = 3 * 1000;
-                 }
-                 fdcount = epoll_wait(fd_ep, ev, ARRAY_SIZE(ev), timeout);
-                 if (fdcount < 0)
-                         continue;
- 
-                 if (fdcount == 0) {
-+                        struct udev_list_node *loop;
-+
-+                        /* timeout */
-                         if (udev_exit) {
--                                info(udev, "timeout, giving up waiting for workers to finish\n");
-+                                err(udev, "timeout, giving up waiting for workers to finish\n");
-                                 break;
-                         }
- 
--                        /* timeout - kill idle workers */
--                        worker_kill(udev, 2);
-+                        /* kill idle workers */
-+                        if (udev_list_node_is_empty(&event_list)) {
-+                                info(udev, "cleanup idle workers\n");
-+                                worker_kill(udev, 2);
-+                        }
-+
-+                        /* check for hanging events */
-+                        udev_list_node_foreach(loop, &worker_list) {
-+                                struct worker *worker = node_to_worker(loop);
-+
-+                                if (worker->state != WORKER_RUNNING)
-+                                        continue;
-+
-+                                if ((now_usec() - worker->event_start_usec) > 30 * 1000 * 1000) {
-+                                        err(udev, "worker [%u] timeout, kill it\n", worker->pid,
-+                                            worker->event ? worker->event->devpath : "<idle>");
-+                                        kill(worker->pid, SIGKILL);
-+                                        worker->state = WORKER_KILLED;
-+                                        /* drop reference taken for state 'running' */
-+                                        worker_unref(worker);
-+                                        if (worker->event) {
-+                                                err(udev, "seq %llu '%s' killed\n",
-+                                                    udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
-+                                                worker->event->exitcode = -64;
-+                                                event_queue_delete(worker->event, true);
-+                                                worker->event = NULL;
-+                                        }
-+                                }
-+                        }
-+
-                 }
- 
-                 is_worker = is_signal = is_inotify = is_netlink = is_ctrl = false;
--- 
-1.7.8.3
-
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
deleted file mode 100644
index 16bc8833a..000000000
--- a/testing/udev/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 147974 2012-01-29 10:36:19Z 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>
-
-pkgbase="udev"
-pkgname=('udev' 'udev-compat')
-pkgver=180
-pkgrel=1
-arch=(i686 x86_64)
-url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
-license=('GPL')
-groups=('base')
-options=(!makeflags !libtool)
-makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
-
-build() {
-  cd $srcdir/$pkgbase-$pkgver
-
-  ./configure --prefix=/usr \
-              --with-rootprefix= \
-              --sysconfdir=/etc \
-              --bindir=/sbin \
-              --libdir=/usr/lib \
-              --with-rootlibdir=/lib \
-              --libexecdir=/lib \
-              --with-systemdsystemunitdir=/lib/systemd/system \
-              --enable-udev_acl
-
-  make
-}
-  
-package_udev() {
-  pkgdesc="The userspace dev tools (udev)"
-  depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils')
-  install=udev.install
-  backup=(etc/udev/udev.conf)
-
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # create framebuffer blacklist
-  install -d -m755 ${pkgdir}/lib/modprobe.d/
-  for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do 
-  	echo "blacklist $mod" 
-  done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
-
-  # /dev/loop0 is created for convenience, to autoload the module if necessary
-  # this is no longer needed when util-linux-2.21 is released as /dev/loop-control
-  # will be used instead. In that case move this to udev-compat
-  install -d -m755 ${pkgdir}/lib/udev/devices/
-  mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0
-  chgrp disk ${pkgdir}/lib/udev/devices/loop0
- 
-  # udevd moved, symlink to make life easy for restarting udevd manually
-  ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in $pkgdir/lib/udev/rules.d/*.rules; do
-    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
-               s#GROUP="tape"#GROUP="storage"#g;
-               s#GROUP="cdrom"#GROUP="optical"#g' $i
-  done
-}
-
-package_udev-compat() {
-  pkgdesc="The userspace dev tools (udev) - additional rules for older kernels"
-  depends=('udev')
-  groups=('')
-  install -d -m755 ${pkgdir}/lib/udev/rules.d
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
-
-  # create static nodes to be compatible with on-demand module
-  # loading in the most recent kernel
-  #
-  # the list of nodes is generated from /lib/modules/`most recent kernel`/modprobe.devname
-  # excluding any devices not included in the LTS kernel and any entries in the
-  # modprobe.devname file of the LTS kernel (if it exists).
-
-  install -d -m755 ${pkgdir}/lib/udev/devices
-  cd ${pkgdir}/lib/udev/devices
-
-  install -d -m755 net
-  mknod net/tun c 10 200
-  mknod ppp c 108 0
-#  mknod loop-control c 10 237 -- does not exist in old kernels
-  mknod uinput c 10 223
-  install -d -m755 mapper
-  mknod mapper/control c 10 236
-  install -d -m755 snd
-  mknod snd/timer c 116 33
-  mknod snd/seq c 116 1
-  mknod btrfs-control c 10 234
-  mknod autofs c 10 235
-  mknod fuse c 10 229
-  install -d -m755 cpu
-  mknod cpu/microcode c 10 184
-  
-}
-md5sums=('1cf124ab5a124ea35d4748ea414926ec')
diff --git a/testing/udev/udev.install b/testing/udev/udev.install
deleted file mode 100644
index c49c5006f..000000000
--- a/testing/udev/udev.install
+++ /dev/null
@@ -1,65 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo "ATTENTION UDEV:"
-    echo "----------"
-    if [ "$(vercmp $2 168)" -lt 0 ]; then
-      echo "Kernel 2.6.32 or newer is now required."
-      echo "  --"
-      echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
-      echo "  --"
-      echo "Arch specific cd symlinks are now no longer created."
-      echo "  --"
-      echo "cd and net persistent rules will no longer be autogenerated,"
-      echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
-      echo "  --"
-      echo "Errors are now logged (possibly to the console) by default."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 171)" -lt 0 ]; then
-      echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
-      echo "blacklisting in MODULES no longer works."
-      echo "See 'man modprobe.conf' for a replacement to blacklisting."
-      echo "To disable a module mod1 on the kernel command line, use"
-      echo "mod1.disable=1"
-      echo "or"
-      echo "modprobe.blacklist=mod1"
-      echo "  --"
-      echo "The following modules are no longer unconditionally loaded:"
-      echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
-      echo "Add them to MODULES in rc.conf if you need them."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 172)" -lt 0 ]; then
-      echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
-      echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
-      echo "takes precedence."
-      echo "  --"
-      echo "kbd and rtc devices are no longer world readable."
-      echo "  --"
-      echo "rtc is no longer in the audio group and fb devices are no longer in"
-      echo "the video group, as permissions and ownership of fb devices are controlled"
-      echo "by X."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 174)" -lt 0 ]; then
-      echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
-      echo "'scanner' and 'video' groups. Beware of any changes."
-      echo "  --"
-      echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-      echo "  --"
-      echo "For security reasons, we no longer add devices to the 'storage' group. Use"
-      echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-      echo "this functionality back."
-      echo " --"
-      echo "We no longer create the static nodes on install needed for an initrd-less boot"
-      echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs."
-      echo " --"
-    fi
-    echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels"
-    echo "have this enabled."
-    echo "---------------"
-  fi
-}
diff --git a/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
deleted file mode 100644
index 993650b2c..000000000
--- a/testing/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/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
deleted file mode 100644
index f014cd857..000000000
--- a/testing/util-linux/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 146238 2012-01-06 20:01:52Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.20.1
-pkgrel=2
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://userweb.kernel.org/~kzak/util-linux-ng/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('filesystem')
-replaces=('linux32' 'util-linux-ng')
-conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
-provides=('linux32' "util-linux-ng=${pkgver}")
-license=('GPL2')
-options=('!libtool')
-#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2
-	0001-findmnt-support-alternative-location-of-fstab.patch)
-optdepends=('perl: for chkdupexe support')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
-  # backport patch needed for usr support in initramfs
-  patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch
-
-  ./configure --enable-arch\
-              --enable-write\
-              --enable-raw\
-              --disable-wall\
-              --enable-partx\
-              --enable-libmount-mount
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -dm755 "${pkgdir}/var/lib/hwclock"
-
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('079b37517fd4e002a2e6e992e8b4e361'
-         '823e2d87885b81f245b8c368e28f8cab')
diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD
deleted file mode 100644
index 16062dd2a..000000000
--- a/testing/wireless_tools/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 147204 2012-01-24 11:13:02Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jason Chu <jchu@xentac.net>
-
-pkgname=wireless_tools
-pkgver=29
-pkgrel=6
-pkgdesc='Wireless Tools'
-url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
-arch=('i686' 'x86_64')
-license=('GPL')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
-
-build() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	make \
-		INSTALL_DIR="${pkgdir}/usr/sbin" \
-		INSTALL_LIB="${pkgdir}/usr/lib" \
-		INSTALL_INC="${pkgdir}/usr/include" \
-		INSTALL_MAN="${pkgdir}/usr/share/man" \
-		install
-}
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index e4677e072..000000000
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146234 2012-01-06 15:24:05Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-_gitdate=20120106
-pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=1
-pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/wiki/"
-license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm' 'udev')
-optdepends=('nouveau-dri:	experimental gallium3d features')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('4b0ee8643b3322ff3a0c5d70262a54af')
-
-# 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/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD
deleted file mode 100644
index b0075a03a..000000000
--- a/testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 146257 2012-01-07 05:13:38Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.0
-pkgrel=1
-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')
-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')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d')
-
-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/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch b/testing/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch
deleted file mode 100644
index dc93a2e8a..000000000
--- a/testing/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-# HG changeset patch
-# User Glenn Randers-Pehrson <glennrp+bmo@gmail.com>
-# Date 1320490106 0
-# Node ID aff1bd412058cb6926a8feae1e8c0fc76b4c04a3
-# Parent  8248dbffd64534fb6c65ad3d757b795119e783c6
-Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15.  We access pixel_depth via png_get_IHDR() instead; r=joedrew
-
-diff --git a/modules/libpr0n/decoders/nsICODecoder.cpp b/modules/libpr0n/decoders/nsICODecoder.cpp
---- a/modules/libpr0n/decoders/nsICODecoder.cpp
-+++ b/modules/libpr0n/decoders/nsICODecoder.cpp
-@@ -381,18 +381,17 @@ nsICODecoder::WriteInternal(const char* 
-       return;
-     }
-     mPos += aCount;
-     aBuffer += aCount;
-     aCount = 0;
- 
-     // Raymond Chen says that 32bpp only are valid PNG ICOs
-     // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
--    if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && 
--        static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
-+    if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
-       PostDataError();
-     }
-     return;
-   }
- 
-   // We've processed all of the icon dir entries and are within the 
-   // bitmap info size
-   if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset && 
-diff --git a/modules/libpr0n/decoders/nsPNGDecoder.h b/modules/libpr0n/decoders/nsPNGDecoder.h
---- a/modules/libpr0n/decoders/nsPNGDecoder.h
-+++ b/modules/libpr0n/decoders/nsPNGDecoder.h
-@@ -68,29 +68,35 @@ public:
- 
-   void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
-                    PRInt32 width, PRInt32 height,
-                    gfxASurface::gfxImageFormat format);
-   void SetAnimFrameInfo();
- 
-   void EndImageFrame();
- 
--  // Checks if the info header contains valid information
--  bool HasValidInfo() const 
-+  // Check if PNG is valid ICO (32bpp RGBA)
-+  // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-+  bool IsValidICO() const
-   {
--    return mInfo && mInfo->valid;
--  }
-+    png_uint_32
-+        png_width,  // Unused
-+        png_height; // Unused
- 
--  // Obtain the pixel depth if available or 0 otherwise
--  PRInt32 GetPixelDepth() const
--  {
--    if (!mInfo) {
--      return 0;
-+    int png_bit_depth,
-+        png_color_type;
-+
-+    if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
-+                     &png_color_type, NULL, NULL, NULL)) {
-+
-+      return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-+              png_bit_depth == 8);
-+    } else {
-+      return false;
-     }
--    return mInfo->pixel_depth;
-   }
- 
- public:
-   png_structp mPNG;
-   png_infop mInfo;
-   nsIntRect mFrameRect;
-   PRUint8 *mCMSLine;
-   PRUint8 *interlacebuf;
-
-
diff --git a/testing/zlib/PKGBUILD b/testing/zlib/PKGBUILD
deleted file mode 100644
index fb2257513..000000000
--- a/testing/zlib/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148043 2012-01-30 14:35:26Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=zlib
-pkgver=1.2.6
-pkgrel=1
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('glibc')
-source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('618e944d7c7cd6521551e30b32322f4a')
-
-build() {
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr
-	make
-
-	grep -A 24 '^  Copyright' zlib.h > LICENSE
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
-}
diff --git a/x86_64/blender/PKGBUILD b/x86_64/blender/PKGBUILD
deleted file mode 100644
index 0f23b4ae5..000000000
--- a/x86_64/blender/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $
-# Contributor: John Sowiak <john@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.61
-pkgrel=4
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio')
-makedepends=('cmake' 'boost' 'cuda-toolkit')
-optdepends=('cuda-toolkit: cycles renderer cuda support')
-options=(!strip)
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('11a4721ff92286f678bb2e05e5f29c97')
-else
-  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=38016
-  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=ON \
-    -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DWITH_CYCLES:BOOL=ON \
-    -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \
-    -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \
-    -DWITH_FFTW3:BOOL=ON \
-    -DWITH_MOD_OCEANSIM:BOOL=ON \
-    -DPYTHON_VERSION:STRING=3.2 \
-    -DPYTHON_LIBPATH:STRING=/usr/lib \
-    -DPYTHON_LIBRARY:STRING=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-    $ENABLESSE2
-
-  make $MAKEFLAGS
-
-  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
-    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
-  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
-  chmod 755 bmake
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/x86_64/blender/blender.install b/x86_64/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/x86_64/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
-}